防错-接口

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

@@ -21,11 +21,13 @@ import com.factory.web.entity.pm.req.AddPmPlanReq;
 import com.factory.web.entity.pm.req.EditItemResultListReq;
 import com.factory.web.entity.pm.req.EditPmPlanReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
+import com.factory.web.entity.pm.req.SearchPmItemNoGoListReq;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanCheckListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
+import com.factory.web.entity.pm.req.SearchPmWorkshopNoGoListReq;
 import com.factory.web.entity.pm.req.SearchTaskReq;
 import com.factory.web.entity.pm.req.SearchWorkshopReq;
 import com.factory.web.entity.pm.res.PmCheckListRes;
@@ -180,14 +182,14 @@ public class PreventMistakeController {
 	@ApiOperation(value = "取得不放行任务对应的工作站")
 	@ApiOperationSupport(order = 18)
 	@PostMapping("/getPmWorkshopNoGoList")
-	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(@RequestBody SearchPmPlanReq req) {
+	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(@RequestBody SearchPmWorkshopNoGoListReq req) {
 		return preventMistakeService.getPmWorkshopNoGoList(req);
 	}
 
 	@ApiOperation(value = "取得不放行任务对应的点检项目")
 	@ApiOperationSupport(order = 19)
 	@PostMapping("/getPmItemNoGoList")
-	public ResponseBean<List<PmItemNoGoListRes>> getPmItemNoGoList(@RequestBody SearchWorkshopReq req) {
+	public ResponseBean<List<PmItemNoGoListRes>> getPmItemNoGoList(@RequestBody SearchPmItemNoGoListReq req) {
 		return preventMistakeService.getPmItemNoGoList(req);
 	}
 	

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchPmItemNoGoListReq.java

@@ -0,0 +1,32 @@
+package com.factory.web.entity.pm.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 SearchPmItemNoGoListReq {
+	
+	@ApiModelProperty(value = "工作站Id")
+	private Long workshopId;
+	
+	@ApiModelProperty(value = "任务id")
+	private Long onsiteTaskId;
+	
+}

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchPmWorkshopNoGoListReq.java

@@ -0,0 +1,32 @@
+package com.factory.web.entity.pm.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 SearchPmWorkshopNoGoListReq {
+	
+	@ApiModelProperty(value = "计划Id")
+	private Long bentelerPlanId;
+	
+	@ApiModelProperty(value = "任务id")
+	private Long onsiteTaskId;
+	
+}

application-facade/src/main/java/com/factory/web/entity/pm/res/PmItemNoGoListRes.java

@@ -1,6 +1,7 @@
 package com.factory.web.entity.pm.res;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
@@ -37,4 +38,7 @@ public class PmItemNoGoListRes implements Serializable {
 	@ApiModelProperty(value = "质量经理")
 	private String approvalPerson;
 	
+	@ApiModelProperty(value = "审批时间")
+	private LocalDateTime approvalTime;
+	
 }

application-facade/src/main/java/com/factory/web/mapper/pm/PreventMistakeMapper.java

@@ -9,12 +9,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.web.entity.pm.req.SearchApprovalUserReq;
+import com.factory.web.entity.pm.req.SearchPmItemNoGoListReq;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanCheckListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
-import com.factory.web.entity.pm.req.SearchWorkshopReq;
+import com.factory.web.entity.pm.req.SearchPmWorkshopNoGoListReq;
 import com.factory.web.entity.pm.res.ApprovalUserRes;
 import com.factory.web.entity.pm.res.PmCheckListRes;
 import com.factory.web.entity.pm.res.PmItemNoGoListRes;
@@ -89,12 +90,12 @@ public interface PreventMistakeMapper extends BaseMapper<BentelerPlan> {
      * @param req
      * @return 不放行任务对应的工作站
      */
-    public List<PmWorkshopNoGoListRes> getPmWorkshopNoGoList(@Param("req") SearchPmPlanReq req);
+    public List<PmWorkshopNoGoListRes> getPmWorkshopNoGoList(@Param("req") SearchPmWorkshopNoGoListReq req);
     
     /**
      * 取得不放行任务对应的点检项目
      * @param req
      * @return 不放行任务对应的点检项目
      */
-    public List<PmItemNoGoListRes> getPmItemNoGoList(@Param("req") SearchWorkshopReq req);
+    public List<PmItemNoGoListRes> getPmItemNoGoList(@Param("req") SearchPmItemNoGoListReq req);
 }

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -44,11 +44,13 @@ import com.factory.web.entity.pm.req.OnsiteItemReq;
 import com.factory.web.entity.pm.req.OnsiteWorkshopReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
 import com.factory.web.entity.pm.req.SearchApprovalUserReq;
+import com.factory.web.entity.pm.req.SearchPmItemNoGoListReq;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanCheckListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
+import com.factory.web.entity.pm.req.SearchPmWorkshopNoGoListReq;
 import com.factory.web.entity.pm.req.SearchTaskReq;
 import com.factory.web.entity.pm.req.SearchWorkshopReq;
 import com.factory.web.entity.pm.res.ApprovalUserRes;
@@ -732,7 +734,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 * @return 不放行任务对应的工作站
 	 */
 	@Override
-	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(SearchPmPlanReq req) {
+	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(SearchPmWorkshopNoGoListReq req) {
 		List<PmWorkshopNoGoListRes> pmWorkshopNoGoList = preventMistakeMapper.getPmWorkshopNoGoList(req);
     	return ResponseBeanBuilder.ok(pmWorkshopNoGoList, Function.identity());
 	}
@@ -744,7 +746,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 * @return 不放行任务对应的点检项目
 	 */
 	@Override
-	public ResponseBean<List<PmItemNoGoListRes>> getPmItemNoGoList(SearchWorkshopReq req) {
+	public ResponseBean<List<PmItemNoGoListRes>> getPmItemNoGoList(SearchPmItemNoGoListReq req) {
 		List<PmItemNoGoListRes> pmItemNoGoList = preventMistakeMapper.getPmItemNoGoList(req);
     	return ResponseBeanBuilder.ok(pmItemNoGoList, Function.identity());
 	}

application-facade/src/main/java/com/factory/web/service/pm/PreventMistakeService.java

@@ -17,11 +17,13 @@ import com.factory.web.entity.pm.req.EditItemResultListReq;
 import com.factory.web.entity.pm.req.EditPmPlanReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
 import com.factory.web.entity.pm.req.SearchApprovalUserReq;
+import com.factory.web.entity.pm.req.SearchPmItemNoGoListReq;
 import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanCheckListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
+import com.factory.web.entity.pm.req.SearchPmWorkshopNoGoListReq;
 import com.factory.web.entity.pm.req.SearchTaskReq;
 import com.factory.web.entity.pm.req.SearchWorkshopReq;
 import com.factory.web.entity.pm.res.ApprovalUserRes;
@@ -224,7 +226,7 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
 	 * @param req
 	 * @return 不放行任务对应的工作站
 	 */
-	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(SearchPmPlanReq req);
+	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(SearchPmWorkshopNoGoListReq req);
 	
 	/**
 	 * 取得不放行任务对应的点检项目
@@ -232,7 +234,7 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
 	 * @param req
 	 * @return 不放行任务对应的点检项目
 	 */
-	public ResponseBean<List<PmItemNoGoListRes>> getPmItemNoGoList(SearchWorkshopReq req);
+	public ResponseBean<List<PmItemNoGoListRes>> getPmItemNoGoList(SearchPmItemNoGoListReq req);
 	
 	/**
 	 * 修改巡检项目检查结果(这里只有重检走这里)

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

@@ -229,14 +229,13 @@
         SELECT  DISTINCT ow.id AS workshop_id,
 		        ow.ws_name
 		FROM    onsite_item_result oir,
-		        onsite_task ot,
 		        onsite_item oi,
 				onsite_workshop ow
-		WHERE   oir.onsite_task_id = ot.id
-		AND     oir.onsite_item_id = oi.id
+		WHERE   oir.onsite_item_id = oi.id
 		AND     oi.workshop_id = ow.id
-		AND     ot.`status` = 3
+		AND     oir.result = 1
 		AND     ow.benteler_plan_id = #{req.bentelerPlanId}
+		AND     oir.onsite_task_id = #{req.onsiteTaskId}
     </select>
     
     <!--取得不放行任务对应的点检项目（onsite_approval_task中status应该追加一个2不放行状态，追加一个审批时间字段） -->
@@ -244,8 +243,8 @@
         SELECT  oir.onsite_item_id,
 		        oi.item_content,
 				oat.approval_user_id,
-				uu.`name` AS approval_person
-				-- 审批时间
+				uu.`name` AS approval_person,
+				oat.updated_time AS approval_time
 		FROM    onsite_item_result oir,
 		        onsite_task ot,
 		        onsite_item oi,
@@ -258,22 +257,9 @@
 		AND     ot.`status` = 3
 		AND     oir.result = 1
 		AND     oat.approval_level = 2
+		AND     oat.`status` = 2
 		AND     oi.workshop_id = #{req.workshopId}
-		-- AND     oat.`status` = 2
-    </select>
-    
-    <!--取得巡讲项目检查结果 -->
-    <select id="getPmItemNoGoList" resultType="com.factory.web.entity.pm.OnsiteItemResult">
-        SELECT oir.id,
-       		   oir.onsite_task_id,
-			   oir.onsite_item_id,
-			   oir.result,
-			   oir.created_user_id,
-			   oir.created_time
-		FROM   onsite_item oi,
-		       onsite_item_result oir
-		WHERE  oi.id = oir.onsite_item_id
-		AND    oir.onsite_task_id = 1
-		AND    oi.workshop_id = 1
+		AND     oir.onsite_task_id = #{req.onsiteTaskId}
     </select>
+
 </mapper>