防错-接口

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

@@ -1,5 +1,7 @@
 package com.factory.controller.web;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,9 +15,11 @@ import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.AddPmPlanReq;
 import com.factory.web.entity.pm.req.EditPmPlanReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
+import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
 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.res.PmItemResultListRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 import com.factory.web.entity.pm.res.PmPlanRes;
 import com.factory.web.service.pm.PreventMistakeService;
@@ -48,8 +52,8 @@ public class PreventMistakeController {
 
 	@ApiOperation(value = "防错计划列表")
 	@ApiOperationSupport(order = 2)
-	@PostMapping("/pmPlanlist")
-	public ResponseBean<PageBean<PmPlanListRes>> pmPlanlist(@RequestBody SearchPmPlanListReq req) {
+	@PostMapping("/getPmPlanlist")
+	public ResponseBean<PageBean<PmPlanListRes>> getPmPlanlist(@RequestBody SearchPmPlanListReq req) {
 		return preventMistakeService.getPmPlanList(req);
 	}
 	
@@ -81,5 +85,12 @@ public class PreventMistakeController {
 		return ResponseBeanBuilder.ok(preventMistakeService.editPmPlan(req));
 	}
 
+	@ApiOperation(value = "检查记录列表")
+	@ApiOperationSupport(order = 7)
+	@PostMapping("/getPmItemResultList")
+	public ResponseBean<List<PmItemResultListRes>> getPmItemResultList(@RequestBody SearchPmItemResultListReq req) {
+		return preventMistakeService.getPmItemResultList(req);
+	}
 	
+	// TODO 详细页面-上方-计划审批通过时间（质量经理、产品经理）、每频次的检查人和检查时间。
 }

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

@@ -0,0 +1,35 @@
+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 SearchPmItemResultListReq {
+	
+	@ApiModelProperty(value = "点检频次")
+	private Integer typeFlag;
+	
+	@ApiModelProperty(value = "年", example = "2021")
+	private String year;
+	
+	@ApiModelProperty(value = "年月", example = "2021-06")
+	private String yearMonth;
+	
+}

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

@@ -0,0 +1,41 @@
+package com.factory.web.entity.pm.res;
+
+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 PmItemResultListRes {
+
+	@ApiModelProperty(value = "工作站id")
+	private Long workshopId;
+	
+	@ApiModelProperty(value = "工作站名称")
+	private String wsName;
+	
+	@ApiModelProperty(value = "巡检项目id")
+	private Long onsiteItemId;
+	
+	@ApiModelProperty(value = "巡检项目内容")
+	private String itemContent;
+	
+	@ApiModelProperty(value = "巡检结果 0通过  1巡检不通过 2没有巡检")
+	private String result;
+
+}

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

@@ -1,12 +1,16 @@
 package com.factory.web.mapper.pm;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 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.SearchPmItemResultListReq;
 import com.factory.web.entity.pm.req.SearchPmPlanListReq;
+import com.factory.web.entity.pm.res.PmItemResultListRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 
 /**
@@ -25,4 +29,11 @@ public interface PreventMistakeMapper extends BaseMapper<BentelerPlan> {
      * @return 防错计划列表
      */
     public Page<PmPlanListRes> getPmPlanList(@Param("page") Page page, @Param("req") SearchPmPlanListReq req);
+    
+    /**
+     * 取得检查记录列表
+     * @param req
+     * @return 检查记录列表
+     */
+    public List<PmItemResultListRes> getPmItemResultList(@Param("req") SearchPmItemResultListReq req);
 }

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

@@ -1,7 +1,7 @@
 package com.factory.web.service.impl.pm;
 
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
@@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.entity.enumPo.PlanType;
-import com.factory.base.entity.po.benteler.BentelerIniCheckItem;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.util.res.ResponseBeanBuilder;
 import com.factory.web.entity.pm.OnsiteCalendar;
@@ -27,10 +27,12 @@ import com.factory.web.entity.pm.req.EditPmPlanReq;
 import com.factory.web.entity.pm.req.OnsiteCalendarReq;
 import com.factory.web.entity.pm.req.OnsiteItemReq;
 import com.factory.web.entity.pm.req.OnsiteWorkshopReq;
-import com.factory.web.entity.pm.req.SearchPmPlanListReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
+import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
+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.res.PmItemResultListRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 import com.factory.web.entity.pm.res.PmPlanRes;
 import com.factory.web.mapper.pm.PreventMistakeMapper;
@@ -276,9 +278,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 		/* 修改日周月点检规则 */
 		// TODO 确认这个删除好用不
+		/* 删除日周月点检规则 */
 		onsiteCalendarService.remove(Wrappers.<OnsiteCalendar>lambdaQuery()
                 .eq(OnsiteCalendar::getBentelerPlanId, plan.getId()));
-		
+		/* 添加日周月点检规则 */
 		List<OnsiteCalendarReq> onsiteCalendarList = req.getOnsiteCalendarList();
 		for (OnsiteCalendarReq onsiteCalendarReq : onsiteCalendarList) {
 			OnsiteCalendar onsiteCalendar = OnsiteCalendar.builder()
@@ -296,22 +299,27 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			onsiteCalendarService.save(onsiteCalendar);
 		}
 
-		/* 添加表头信息 */
+		/* 修改表头信息 */
 		// TODO 确认表头传过来的数据类型
-//		LambdaUpdateWrapper<User> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-//		lambdaUpdateWrapper.eq(User::getName, "rhb").set(User::getAge, 18);
-//		Integer rows = userMapper.update(null, lambdaUpdateWrapper);
-//
-//		onsiteTitleBlobService.update(updateWrapper)
-		
-		
-		OnsiteTitleBlob onsiteTitleBlob = OnsiteTitleBlob.builder()
-				.bentelerPlanId(plan.getId())
-				.titleContent(req.getTitleContent().getBytes(StandardCharsets.UTF_8))
-				.build();
-		onsiteTitleBlobService.save(onsiteTitleBlob);
+		LambdaUpdateWrapper<OnsiteTitleBlob> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(OnsiteTitleBlob::getBentelerPlanId, plan.getId())
+                           .set(OnsiteTitleBlob::getTitleContent, req.getTitleContent().getBytes(StandardCharsets.UTF_8));
+        onsiteTitleBlobService.update(lambdaUpdateWrapper);
 
-		/* 添加工作站信息 */
+        /* 修改工作站、巡检项目 */
+        /* 删除巡检项目 */
+        List<OnsiteWorkshop> onsiteWorkshopListTemp = onsiteWorkshopService.list(Wrappers.<OnsiteWorkshop>lambdaQuery()
+                .eq(OnsiteWorkshop::getBentelerPlanId, plan.getId()));
+        List<Long> workshopIdList = new ArrayList<Long>();
+        for (OnsiteWorkshop onsiteWorkshop : onsiteWorkshopListTemp) {
+        	workshopIdList.add(onsiteWorkshop.getId());
+        }
+        onsiteItemService.remove(Wrappers.<OnsiteItem>lambdaQuery()
+                .in(OnsiteItem::getWorkshopId, workshopIdList));
+        /* 删除工作站 */
+        onsiteWorkshopService.remove(Wrappers.<OnsiteWorkshop>lambdaQuery()
+                .in(OnsiteWorkshop::getBentelerPlanId, plan.getId()));
+        /* 添加工作站信息 */
 		List<OnsiteWorkshopReq> onsiteWorkshopList = req.getOnsiteWorkshopList();
 		for (OnsiteWorkshopReq onsiteWorkshopReq : onsiteWorkshopList) {
 			if (this.checkWsNameExist(onsiteWorkshopReq.getWsName())) {
@@ -339,4 +347,15 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 		return ResponseBeanBuilder.ok();
 	}
+	
+	/**
+     * 取得检查记录列表
+     * @param req
+     * @return 检查记录列表
+     */
+    public ResponseBean<List<PmItemResultListRes>> getPmItemResultList(SearchPmItemResultListReq req) {
+    	List<PmItemResultListRes> listRes = preventMistakeMapper.getPmItemResultList(req);
+		return ResponseBeanBuilder.ok(listRes, Function.identity());
+    }
+   
 }

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

@@ -1,5 +1,9 @@
 package com.factory.web.service.pm;
 
+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;
@@ -8,9 +12,11 @@ import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.AddPmPlanReq;
 import com.factory.web.entity.pm.req.EditPmPlanReq;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
+import com.factory.web.entity.pm.req.SearchPmItemResultListReq;
 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.res.PmItemResultListRes;
 import com.factory.web.entity.pm.res.PmPlanListRes;
 import com.factory.web.entity.pm.res.PmPlanRes;
 
@@ -77,5 +83,13 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
      * @return 
      */
 	public ResponseBean editPmPlan(EditPmPlanReq req);
+
+    /**
+     * 取得检查记录列表
+     * @param req
+     * @return 检查记录列表
+     */
+    public ResponseBean<List<PmItemResultListRes>> getPmItemResultList(SearchPmItemResultListReq req);
+   
     
 }

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

@@ -21,6 +21,28 @@
 		GROUP BY bp.id
     </select>
     
+    <!--取得检查记录 -->
+    <select id="getPmItemResultList" resultType="com.factory.web.entity.pm.res.PmItemResultListRes">
+        SELECT oi.workshop_id,
+		       ow.ws_name,
+		       oir.onsite_item_id,
+		       oi.item_content,
+		       oir.result
+		FROM   onsite_item_result oir,
+		       onsite_item oi,
+		       onsite_workshop ow,
+		       onsite_task ot,
+		       onsite_calendar oc
+		WHERE  oir.onsite_item_id = oi.id
+		AND    oi.workshop_id = ow.id
+		AND    oir.onsite_task_id = ot.id
+		AND    ot.onsite_calendar_id = oc.id
+		AND    oc.type_flag = #{req.typeFlag}
+		AND    DATE_FORMAT(oir.created_time,'%Y-%m') = #{req.yearMonth}
+		AND    DATE_FORMAT(oir.created_time,'%Y') = #{req.year}
+        ORDER BY oi.workshop_id, oir.onsite_item_id
+    </select>
+    
 
 
 </mapper>