首件-接口-调整

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

@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class SearchFaCalendarReq {
 	
+	@ApiModelProperty(value = "计划Id")
+	private Long bentelerPlanId;
+	
 	@ApiModelProperty(value = "日期", example = "2021-06-08")
 	private String checkDate;
 	

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

@@ -381,6 +381,7 @@
 	</select>
 	
 	<!--取得点检人 -->
+	<!-- 
     <select id="getFaCalendarList" resultType="com.factory.web.entity.fa.res.FaCalendarRes">
         SELECT DISTINCT fac.type_flag,
 		       fat.task_time,
@@ -392,5 +393,72 @@
 		AND    fac.user_id = uu.id
 		AND    fat.task_time = #{req.checkDate}
     </select>
+     -->
+    <select id="getFaCalendarList" resultType="com.factory.web.entity.fa.res.FaCalendarRes">
+        SELECT 
+			0 AS type_flag,
+			fat.task_time,
+			MIN( fair.created_time ) AS check_time,
+			GROUP_CONCAT( DISTINCT uu.`name` ) AS check_person 
+		FROM
+			first_article_task fat,
+			first_article_calendar fac,
+			us_user uu,
+			first_article_item_result fair,
+		  first_article_item fai	
+		WHERE
+			fat.first_article_calendar_id = fac.id 
+			AND fair.first_article_task_id = fat.id 
+			AND fair.first_article_item_id = fai.id
+			AND fair.created_user_id = uu.id 
+			AND fat.task_time = #{req.checkDate}
+			AND fac.benteler_plan_id = #{req.bentelerPlanId}
+			AND fai.first_flag = 1
+		
+		UNION ALL
+		
+		SELECT 
+			1 AS type_flag,
+			fat.task_time,
+			MIN( fair.created_time ) AS check_time,
+			GROUP_CONCAT( DISTINCT uu.`name` ) AS check_person 
+		FROM
+			first_article_task fat,
+			first_article_calendar fac,
+			us_user uu,
+			first_article_item_result fair,
+		  first_article_item fai	
+		WHERE
+			fat.first_article_calendar_id = fac.id 
+			AND fair.first_article_task_id = fat.id 
+			AND fair.first_article_item_id = fai.id
+			AND fair.created_user_id = uu.id 
+			AND fat.task_time = #{req.checkDate}
+			AND fac.benteler_plan_id = #{req.bentelerPlanId}
+			AND fai.two_hundred_flag = 1
+		
+		UNION ALL
+		
+		SELECT 
+			2 AS type_flag,
+			fat.task_time,
+			MIN( fair.created_time ) AS check_time,
+			GROUP_CONCAT( DISTINCT uu.`name` ) AS check_person 
+		FROM
+			first_article_task fat,
+			first_article_calendar fac,
+			us_user uu,
+			first_article_item_result fair,
+		  first_article_item fai	
+		WHERE
+			fat.first_article_calendar_id = fac.id 
+			AND fair.first_article_task_id = fat.id 
+			AND fair.first_article_item_id = fai.id
+			AND fair.created_user_id = uu.id 
+			AND fat.task_time = #{req.checkDate}
+			AND fac.benteler_plan_id = #{req.bentelerPlanId}
+			AND fai.catch_flag = 1
+
+    </select>
     
 </mapper>