任务都改成1分钟，修改统计Bug

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

@@ -24,11 +24,17 @@ import java.io.Serializable;
 @ApiModel("")
 public class FaWorkshopNoGoListRes implements Serializable {
 
+	@ApiModelProperty(value = "计划id")
+	private Long bentelerPlanId;
+	
     @ApiModelProperty(value = "工作站id")
     private Long workshopId;
 
     @ApiModelProperty(value = "工作站名称")
     private String wsName;
+    
+    @ApiModelProperty(value = "工作站名称")
+    private String plName;
 
     @ApiModelProperty(value = "0没完成 1全部完成")
     private Integer allCheckFlag;

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

@@ -652,7 +652,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             }
         }
         ResponseBean<List<FirstArticleWorkshop>> r = ResponseBeanBuilder.ok(listRes, Function.identity());
-        r.setMessage(calendar.getTypeFlag());
+        if(calendar!=null) {
+        	r.setMessage(calendar.getTypeFlag());
+        }
         return r;
     }
 
@@ -961,8 +963,14 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 faWorkshop.setAllCheckFlag(0);
             }
         }
-
-        return ResponseBeanBuilder.ok(faWorkshopNoGoList, Function.identity());
+        FirstArticleTask task = firstArticleTaskService.getById(req.getFirstArticleTaskId());
+        FirstArticleCalendar calendar = firstArticleCalendarService.getById(task.getFirstArticleCalendarId());
+        
+        ResponseBean<List<FaWorkshopNoGoListRes>> r = ResponseBeanBuilder.ok(faWorkshopNoGoList, Function.identity());
+        if(calendar!=null) {
+        	r.setMessage(calendar.getTypeFlag());
+        }
+        return r;
     }
 
     /**

application-facade/src/main/resources/mapper/FirstArticleMapper.xml

@@ -172,7 +172,9 @@
     <!--取得不放行任务对应的工作站 -->
     <select id="getFaWorkshopNoGoList" resultType="com.factory.web.entity.fa.res.FaWorkshopNoGoListRes">
         SELECT DISTINCT faw.id AS workshop_id,
-                        faw.ws_name
+                        faw.ws_name,
+                        faw.pl_name,
+                        faw.benteler_plan_id bentelerPlanId
         FROM first_article_item_result fair,
              first_article_item fai,
              first_article_workshop faw