增加workshop的任务id

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleWorkshop.java

@@ -32,6 +32,9 @@ public class FirstArticleWorkshop implements Serializable {
 
     @ApiModelProperty(value = "计划id")
     private Long bentelerPlanId;
+    
+    @ApiModelProperty(value = "任务id")
+    private Long taskId;
 
     @ApiModelProperty(value = "工作站名称")
     private String wsName;

application-facade/src/main/java/com/factory/web/entity/fa/res/FaWorkshopNoGoListRes.java

@@ -29,6 +29,9 @@ public class FaWorkshopNoGoListRes implements Serializable {
 	
     @ApiModelProperty(value = "工作站id")
     private Long workshopId;
+    
+    @ApiModelProperty(value = "任务id")
+    private Long taskId;
 
     @ApiModelProperty(value = "工作站名称")
     private String wsName;

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -631,6 +631,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         SearchFaItemListForPadReq searchFaItemListReq = null;
         SearchFaWsItemResultCountReq searchFaWsItemResultCountReq = null;
         for (FirstArticleWorkshop firstArticleWorkshop : listRes) {
+        	firstArticleWorkshop.setTaskId(firstArticleTaskId);
             /* 取得点检项目 */
             searchFaItemListReq = new SearchFaItemListForPadReq();
             searchFaItemListReq.setWorkshopId(firstArticleWorkshop.getId());
@@ -958,7 +959,10 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     public ResponseBean<List<FaWorkshopNoGoListRes>> getFaWorkshopNoGoList(SearchFaWorkshopNoGoListReq req) {
         List<FaWorkshopNoGoListRes> faWorkshopNoGoList = firstArticleMapper.getFaWorkshopNoGoList(req);
         SearchFaWsItemResultCountReq searchFaWsItemResultCountReq = null;
+        FirstArticleTask task = firstArticleTaskService.getById(req.getFirstArticleTaskId());
+        FirstArticleCalendar calendar = firstArticleCalendarService.getById(task.getFirstArticleCalendarId());
         for (FaWorkshopNoGoListRes faWorkshop : faWorkshopNoGoList) {
+        	faWorkshop.setTaskId(task.getId());
             searchFaWsItemResultCountReq = new SearchFaWsItemResultCountReq();
             searchFaWsItemResultCountReq.setFirstArticleTaskId(req.getFirstArticleTaskId());
             searchFaWsItemResultCountReq.setWorkshopId(faWorkshop.getWorkshopId());
@@ -969,8 +973,6 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 faWorkshop.setAllCheckFlag(0);
             }
         }
-        FirstArticleTask task = firstArticleTaskService.getById(req.getFirstArticleTaskId());
-        FirstArticleCalendar calendar = firstArticleCalendarService.getById(task.getFirstArticleCalendarId());
         
         ResponseBean<List<FaWorkshopNoGoListRes>> r = ResponseBeanBuilder.ok(faWorkshopNoGoList, Function.identity());
         if(calendar!=null) {