增加记录点检人 点检时间

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

@@ -4,6 +4,9 @@ package com.factory.controller.web;
 import java.util.List;
 import java.util.function.Function;
 
+import com.factory.web.entity.pm.req.SearchPmPlanListForPadReq;
+import com.factory.web.entity.pm.res.GetUnFinishedNumRes;
+import com.factory.web.entity.vo.req.pad.GetUnFinishedNumReq;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -249,15 +252,38 @@ public class FirstArticleController {
     @ApiOperationSupport(order = 22)
     public ResponseBean<Void> setFaRepeatResult(@RequestBody SearchFaTaskReq req) {
         firstArticleService.setFaRepeatResult(req.getFirstArticleTaskId());
-        return ResponseBeanBuilder.ok();
-    }
-    
-    @ApiOperation(value = "获取中断任务列表")
-    @PostMapping("/getFaBreakTaskForPad")
-    @ApiOperationSupport(order = 23)
-    public ResponseBean<List<FaTaskResForPad>> getFaBreakTaskForPad(@RequestBody SearchFaWorkshopListForPadReq req) {
-    	List<FaTaskResForPad> list = firstArticleService.getFaBreakTaskForPad(req);
-        return ResponseBeanBuilder.ok(list, Function.identity());
-    }
+		return ResponseBeanBuilder.ok();
+	}
+
+	@ApiOperation(value = "获取中断任务列表")
+	@PostMapping("/getFaBreakTaskForPad")
+	@ApiOperationSupport(order = 23)
+	public ResponseBean<List<FaTaskResForPad>> getFaBreakTaskForPad(@RequestBody SearchFaWorkshopListForPadReq req) {
+		List<FaTaskResForPad> list = firstArticleService.getFaBreakTaskForPad(req);
+		return ResponseBeanBuilder.ok(list, Function.identity());
+	}
+
+	@ApiOperation(value = "查询未完成数量提示")
+	@PostMapping("/getUnFinishedNum")
+	@ApiOperationSupport(order = 23)
+	public ResponseBean<GetUnFinishedNumRes> getUnFinishedNum(@RequestBody GetUnFinishedNumReq req) {
+		//首件未完成计划数量
+		SearchFaPlanListForPadReq searchFaPlanListForPadReq = SearchFaPlanListForPadReq.builder().userId(req.getUserId()).type(0).build();
+		int firstUnfinishNum = firstArticleService.getFaPlanListForPad(searchFaPlanListForPadReq).getData().size();
+		//放错数量
+		SearchPmPlanListForPadReq errorReq = SearchPmPlanListForPadReq.builder().userId(req.getUserId()).type(0).build();
+		int errorNum = preventMistakeService.getPmPlanListForPad(errorReq).getData().size();
+		//异常重检数量
+		SearchFaPlanListForPadReq firstReinspectionReq = SearchFaPlanListForPadReq.builder().type(2).typeFlag(0).userId(req.getUserId()).build();
+		int firstReinspectionNum = firstArticleService.getFaPlanListForPad(firstReinspectionReq).getData().size();
+		//异常重建防错数量
+		SearchPmPlanListForPadReq errorReinspectionReq = SearchPmPlanListForPadReq.builder().type(2).userId(req.getUserId()).build();
+		int errorReinspectionNum = preventMistakeService.getPmPlanListForPad(errorReinspectionReq).getData().size();
+		return ResponseBeanBuilder.ok(GetUnFinishedNumRes.builder()
+				.ReinspectionNum(firstReinspectionNum + errorReinspectionNum)
+				.errorNum(errorNum)
+				.firstUnfinishNum(firstUnfinishNum)
+				.build());
+	}
 
 }

application-facade/src/main/java/com/factory/controller/wx/PlanApprovalController.java

@@ -4,11 +4,17 @@ import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.web.entity.vo.res.unfinishedNum;
 import com.factory.wx.entity.req.PlanApprovalReq;
 import com.factory.wx.entity.req.PlanInfoReq;
 import com.factory.wx.entity.req.PlanPageReq;
+import com.factory.wx.entity.req.WxUnfinishedNumReq;
 import com.factory.wx.entity.res.PlanApprovalDetailRes;
+import com.factory.wx.entity.res.PlanPassRes;
+import com.factory.wx.entity.res.ReminderRes;
 import com.factory.wx.service.PlanApprovalService;
+import com.factory.wx.service.PlanPassService;
+import com.factory.wx.service.PlanReminderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 微信小程序端计划
  *
@@ -33,6 +41,10 @@ public class PlanApprovalController {
 
     @Autowired
     private PlanApprovalService planApprovalService;
+    @Autowired
+    private PlanPassService planPassService;
+    @Autowired
+    private PlanReminderService planReminderService;
 
     @ApiOperation(value = "计划审批列表")
     @PostMapping("/list")
@@ -62,4 +74,22 @@ public class PlanApprovalController {
         return planApprovalService.approvalOperate(planApprovalReq);
     }
 
+    @ApiOperation(value = "菜单的数量提醒  相当于统计各个1层级列表（计划审批，计划放行，计划提醒） 的数量")
+    @PostMapping("/unfinishedNum")
+    public ResponseBean<unfinishedNum> unfinishedNum(@RequestBody WxUnfinishedNumReq wxUnfinishedNumReq) {
+        PlanPageReq build0 = PlanPageReq.builder().userId(wxUnfinishedNumReq.getUserId()).page(1).size(999).checkType(0L).build();
+        PlanPageReq build1 = PlanPageReq.builder().userId(wxUnfinishedNumReq.getUserId()).page(1).size(999).checkType(1L).build();
+        PlanPageReq build2 = PlanPageReq.builder().userId(wxUnfinishedNumReq.getUserId()).page(1).size(999).checkType(2L).build();
+
+        //计划审批
+        Long totalfir = planApprovalService.getApprovalListByPage(build0).getTotal();
+        //计划放行
+        int size = planPassService.getPassList(build1).size();
+        int size1 = planPassService.getPassList(build2).size();
+        //计划提醒
+        int size2 = planReminderService.getReminderList(build0).size();
+
+        return ResponseBeanBuilder.ok(unfinishedNum.builder().approval(totalfir.intValue()).pass(size + size1).remind(size2).build());
+    }
+
 }

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

@@ -0,0 +1,31 @@
+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;
+
+/**
+ * @program: smart-factory-new
+ * @description:
+ * @author: dl
+ * @create: 08月13日 09时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("GetUnFinishedNumRes")
+public class GetUnFinishedNumRes {
+    @ApiModelProperty("首件未完成数量")
+    Integer firstUnfinishNum;
+    @ApiModelProperty("放错未完成数量")
+    Integer errorNum;
+    @ApiModelProperty("重检待完成")
+    Integer ReinspectionNum;
+
+}

application-facade/src/main/java/com/factory/web/entity/vo/req/pad/GetUnFinishedNumReq.java

@@ -0,0 +1,27 @@
+package com.factory.web.entity.vo.req.pad;
+
+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;
+
+/**
+ * @program: smart-factory-new
+ * @description:
+ * @author: dl
+ * @create: 08月13日 09时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("GetUnFinishedNumReq")
+public class GetUnFinishedNumReq {
+    @ApiModelProperty(value = "Pad端登录的检查人员用户Id")
+    private Long userId;
+
+}

application-facade/src/main/java/com/factory/web/entity/vo/res/unfinishedNum.java

@@ -0,0 +1,27 @@
+package com.factory.web.entity.vo.res;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: smart-factory-new
+ * @description:
+ * @author: dl
+ * @create: 08月13日 10时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class unfinishedNum {
+    @ApiModelProperty(value = "审批")
+    private Integer approval;
+    @ApiModelProperty(value = "放行")
+    private Integer pass;
+    @ApiModelProperty(value = "提醒")
+    private Integer remind;
+
+}

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

@@ -1390,6 +1390,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
 
         ArrayList<Map<String, String>> arrayList = new ArrayList<>();
+
+        AtomicInteger id = new AtomicInteger(1);
         //返回工作站结果
         firstArticleWorkshopList.forEach(item -> {
             Map<String, String> workMap = Convert.toMap(String.class, String.class, item);
@@ -1397,14 +1399,15 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             workMap.remove("allCheckFlag");
             workMap.remove("id");
 
-            AtomicInteger id = new AtomicInteger(1);
             //返回巡检结果
             item.getFirstArticleItemList().forEach(item1 -> {
 
                 Map<String, String> beanMap = Convert.toMap(String.class, String.class, item1);
                 List<Integer> worksNumList = IntStream.rangeClosed(item1.getSnoStart(), item1.getSnoEnd()).boxed().collect(Collectors.toList());
                 workMap.forEach((key, value) -> {
-                    beanMap.merge(key, value, (v1, v2) -> v1);
+                    if (value != null) {
+                        beanMap.merge(key, value, (v1, v2) -> v1);
+                    }
                 });
 
                 List<String> frequencyList = new ArrayList<>();

application-facade/src/main/java/com/factory/wx/entity/req/WxUnfinishedNumReq.java

@@ -0,0 +1,25 @@
+package com.factory.wx.entity.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @program: smart-factory-new
+ * @description:
+ * @author: dl
+ * @create: 08月13日 10时
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class WxUnfinishedNumReq {
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+}