首件-接口

application-facade/src/main/java/com/factory/controller/web/FirstArticleController.java

@@ -19,7 +19,7 @@ import com.factory.web.entity.fa.req.AddFaPlanReq;
 import com.factory.web.entity.fa.req.EditFaItemResultListReq;
 import com.factory.web.entity.fa.req.EditFaPlanReq;
 import com.factory.web.entity.fa.req.SearchALLPlanListReq;
-import com.factory.web.entity.fa.req.SearchFaAllCheckFlagReq;
+import com.factory.web.entity.fa.req.SearchFaCalendarReq;
 import com.factory.web.entity.fa.req.SearchFaCheckRecordListReq;
 import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
@@ -30,7 +30,7 @@ import com.factory.web.entity.fa.req.SearchFaTaskReq;
 import com.factory.web.entity.fa.req.SearchFaWorkshopListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaWorkshopNoGoListReq;
 import com.factory.web.entity.fa.req.SubmitFaTaskReq;
-import com.factory.web.entity.fa.res.FaAllCheckFlagRes;
+import com.factory.web.entity.fa.res.FaCalendarRes;
 import com.factory.web.entity.fa.res.FaCheckRecordListRes;
 import com.factory.web.entity.fa.res.FaItemListForPadRes;
 import com.factory.web.entity.fa.res.FaItemNoGoListRes;
@@ -210,4 +210,11 @@ public class FirstArticleController {
 		return ResponseBeanBuilder.ok(firstArticleService.getUserList());
 	}
 	
+	@ApiOperation(value = "取得点检人和点检日期")
+	@PostMapping("/getFaCalendarList")
+	@ApiOperationSupport(order = 21)
+	public ResponseBean<List<FaCalendarRes>> getFaCalendarList(@RequestBody SearchFaCalendarReq req) {
+		return ResponseBeanBuilder.ok(firstArticleService.getFaCalendarList(req));
+	}
+	
 }

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

@@ -0,0 +1,29 @@
+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 SearchFaCalendarReq {
+	
+	@ApiModelProperty(value = "日期", example = "2021-06-08")
+	private String checkDate;
+	
+}

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

@@ -0,0 +1,42 @@
+package com.factory.web.entity.fa.res;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+import com.factory.web.entity.fa.FirstArticleCalendar;
+import com.factory.web.entity.fa.FirstArticleTitle;
+import com.factory.web.entity.fa.FirstArticleWorkshop;
+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 FaCalendarRes implements Serializable {
+
+	@ApiModelProperty(value = "0表示首件 1表示200件 2表示中断")
+	private Integer typeFlag;
+	
+	@ApiModelProperty(value = "检验时间")
+	private LocalDate taskTime;
+	
+	@ApiModelProperty(value = "检验人")
+	private String checkPerson;
+
+}

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

@@ -11,6 +11,7 @@ import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.web.entity.fa.FirstArticleItemResult;
 import com.factory.web.entity.fa.FirstArticleTask;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
+import com.factory.web.entity.fa.req.SearchFaCalendarReq;
 import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
 import com.factory.web.entity.fa.req.SearchFaItemReleaseCountReq;
@@ -25,6 +26,7 @@ import com.factory.web.entity.fa.req.SearchFaWorkshopListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaWorkshopNoGoListReq;
 import com.factory.web.entity.fa.req.SearchFaWsItemResultCountReq;
 import com.factory.web.entity.fa.req.SearchUserListReq;
+import com.factory.web.entity.fa.res.FaCalendarRes;
 import com.factory.web.entity.fa.res.FaItemListForPadRes;
 import com.factory.web.entity.fa.res.FaItemNoGoListRes;
 import com.factory.web.entity.fa.res.FaNoGoTaskAapprovalRes;
@@ -155,4 +157,11 @@ public interface FirstArticleMapper extends BaseMapper<BentelerPlan> {
      */
     public int getFaItemReleaseCount(@Param("req") SearchFaItemReleaseCountReq req);
     
+    /**
+     * 取得点检人
+     * @param req
+     * @return 点检人
+     */
+    public List<FaCalendarRes> getFaCalendarList(@Param("req") SearchFaCalendarReq req);
+    
 }

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

@@ -2,6 +2,8 @@ package com.factory.web.service.fa;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
@@ -16,6 +18,7 @@ import com.factory.web.entity.fa.req.EditFaItemResultListReq;
 import com.factory.web.entity.fa.req.EditFaPlanReq;
 import com.factory.web.entity.fa.req.SearchALLPlanListReq;
 import com.factory.web.entity.fa.req.SearchFaAllCheckFlagReq;
+import com.factory.web.entity.fa.req.SearchFaCalendarReq;
 import com.factory.web.entity.fa.req.SearchFaCheckRecordListReq;
 import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
@@ -29,6 +32,7 @@ import com.factory.web.entity.fa.req.SearchFaWorkshopListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaWorkshopNoGoListReq;
 import com.factory.web.entity.fa.req.SubmitFaTaskReq;
 import com.factory.web.entity.fa.res.FaAllCheckFlagRes;
+import com.factory.web.entity.fa.res.FaCalendarRes;
 import com.factory.web.entity.fa.res.FaCheckRecordListRes;
 import com.factory.web.entity.fa.res.FaItemListForPadRes;
 import com.factory.web.entity.fa.res.FaItemNoGoListRes;
@@ -231,4 +235,11 @@ public interface FirstArticleService extends IService<BentelerPlan> {
      * @return 取得用户列表
      */
     public List<UserListRes> getUserList();
+    
+    /**
+     * 取得点检人
+     * @param req
+     * @return 点检人
+     */
+    public List<FaCalendarRes> getFaCalendarList(SearchFaCalendarReq req);
 }

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

@@ -42,6 +42,7 @@ import com.factory.web.entity.fa.req.FirstArticleCalendarReq;
 import com.factory.web.entity.fa.req.FirstArticleItemReq;
 import com.factory.web.entity.fa.req.FirstArticleWorkshopReq;
 import com.factory.web.entity.fa.req.SearchALLPlanListReq;
+import com.factory.web.entity.fa.req.SearchFaCalendarReq;
 import com.factory.web.entity.fa.req.SearchFaCheckRecordListReq;
 import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
@@ -57,6 +58,7 @@ import com.factory.web.entity.fa.req.SearchFaWorkshopNoGoListReq;
 import com.factory.web.entity.fa.req.SearchFaWsItemResultCountReq;
 import com.factory.web.entity.fa.req.SearchUserListReq;
 import com.factory.web.entity.fa.req.SubmitFaTaskReq;
+import com.factory.web.entity.fa.res.FaCalendarRes;
 import com.factory.web.entity.fa.res.FaCheckRecordListRes;
 import com.factory.web.entity.fa.res.FaItemListForPadRes;
 import com.factory.web.entity.fa.res.FaItemNoGoListRes;
@@ -1089,6 +1091,16 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     	List<UserListRes> userList = firstArticleMapper.getUserList(searchUserListReq);
         return userList;
     }
+    
+    /**
+     * 取得点检人
+     * @param req
+     * @return 点检人
+     */
+    public List<FaCalendarRes> getFaCalendarList(SearchFaCalendarReq req) {
+    	List<FaCalendarRes> faCalendarList = firstArticleMapper.getFaCalendarList(req);
+        return faCalendarList;
+    }
 	
 	/**
      * Object转成byte[]

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

@@ -379,5 +379,18 @@
 		AND     fair.first_article_item_id = #{req.firstArticleItemId}
 		AND     DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
 	</select>
+	
+	<!--取得点检人 -->
+    <select id="getFaCalendarList" resultType="com.factory.web.entity.fa.res.FaCalendarRes">
+        SELECT DISTINCT fac.type_flag,
+		       fat.task_time,
+			   uu.`name` AS check_person
+		FROM   first_article_task fat,
+			   first_article_calendar fac,
+			   us_user uu
+		WHERE  fat.first_article_calendar_id = fac.id
+		AND    fac.user_id = uu.id
+		AND    fat.task_time = #{req.checkDate}
+    </select>
     
 </mapper>