首件-接口

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

@@ -99,4 +99,8 @@ public class FirstArticleItem implements Serializable {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "中断检查结果")
     private List<FirstArticleItemResult> catchItemResultList; // 用于页面返回值
+	
+	@TableField(exist = false)
+	@ApiModelProperty(value = "是否有特殊情况的首件放行记录 0没有 1有")
+	private Integer releaseFlag;
 }

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

@@ -0,0 +1,32 @@
+package com.factory.web.entity.fa.req;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 取得不放行任务对应的工作站
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class SearchFaItemReleaseCountReq {
+	
+	@ApiModelProperty(value = "巡检项目id")
+	private Long firstArticleItemId;
+	
+	@ApiModelProperty(value = "日期", example = "2021-06-08")
+	private String checkDate;
+	
+}

application-facade/src/main/java/com/factory/web/mapper/fa/FirstArticleMapper.java

@@ -13,6 +13,7 @@ import com.factory.web.entity.fa.FirstArticleTask;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
 import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
+import com.factory.web.entity.fa.req.SearchFaItemReleaseCountReq;
 import com.factory.web.entity.fa.req.SearchFaItemResultCountReq;
 import com.factory.web.entity.fa.req.SearchFaItemResultListReq;
 import com.factory.web.entity.fa.req.SearchFaPlanCheckListReq;
@@ -147,4 +148,11 @@ public interface FirstArticleMapper extends BaseMapper<BentelerPlan> {
      */
     public List<UserListRes> getUserList(@Param("req") SearchUserListReq req);
     
+    /**
+     * 判断当前检查项目是否是放行
+     * @param req
+     * @return 检查项目是否是放行
+     */
+    public int getFaItemReleaseCount(@Param("req") SearchFaItemReleaseCountReq req);
+    
 }

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

@@ -45,6 +45,7 @@ import com.factory.web.entity.fa.req.SearchALLPlanListReq;
 import com.factory.web.entity.fa.req.SearchFaCheckRecordListReq;
 import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
+import com.factory.web.entity.fa.req.SearchFaItemReleaseCountReq;
 import com.factory.web.entity.fa.req.SearchFaItemResultListReq;
 import com.factory.web.entity.fa.req.SearchFaPlanCheckListReq;
 import com.factory.web.entity.fa.req.SearchFaPlanListForPadReq;
@@ -982,6 +983,18 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 				/* 中断检查结果(一天提交多个中断task，暂时都取出来了) */
 				List<FirstArticleItemResult> catchItemResultList = this.getItemResultList(firstArticleItem.getId(), req.getCheckDate(), 2);
 				firstArticleItem.setCatchItemResultList(catchItemResultList);
+				
+				/* 判断当前检查项目是否是放行 */
+				SearchFaItemReleaseCountReq searchFaItemReleaseCountReq = new SearchFaItemReleaseCountReq();
+				searchFaItemReleaseCountReq.setCheckDate(req.getCheckDate());
+				searchFaItemReleaseCountReq.setFirstArticleItemId(firstArticleItem.getId());				
+				int count = firstArticleMapper.getFaItemReleaseCount(searchFaItemReleaseCountReq);
+				if (count > 0) {
+					firstArticleItem.setReleaseFlag(1); // 1有
+				} else {
+					firstArticleItem.setReleaseFlag(0); // 0没有
+				}
+
 			}
 
 			firstArticleWorkshop.setFirstArticleItemList(firstArticleItemList);

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

@@ -368,4 +368,16 @@
 		</if>
     </select>
     
+    <!-- 判断当前检查项目是否是放行 -->
+	<select id="getFaItemReleaseCount" resultType="int">
+	    SELECT  COUNT(*)
+		FROM    first_article_item_result fair,
+				first_article_task fat
+		WHERE   fair.first_article_task_id = fat.id
+		AND     fat.`status` = 2
+		AND     fair.result = 1
+		AND     fair.first_article_item_id = #{req.firstArticleItemId}
+		AND     DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
+	</select>
+    
 </mapper>