仓库报表

platform-dao/src/main/java/com/platform/dao/vo/NoticeNumberVO.java

@@ -26,6 +26,11 @@ public class NoticeNumberVO implements Serializable {
     private BigDecimal waitForDistributionNum;
     //待审核
     private BigDecimal pendingApprovalNum;
+
+    //待维修主管审核
+    private BigDecimal repairCheckNum;
+    //待生产审核
+    private BigDecimal produceCheckNum;
     //已完成
     private BigDecimal finishedNum;
 

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -377,4 +377,5 @@ public class RepairApplicationFormController {
         return new R<>();
     }
 
+
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -118,6 +118,24 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private NoticeNumberVO addRepairNums(NoticeNumberVO noticeNumberVO,List<RepairApplicationFormVO> repairApplicationFormVOS){
         if(repairApplicationFormVOS!=null) {
             for (RepairApplicationFormVO vo : repairApplicationFormVOS) {
+                //超级管理员
+                if (noticeNumberVO.getRoleFlag()==0){
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()) {
+                        noticeNumberVO.setProduceCheckNum(new BigDecimal(vo.getRepairCount()));
+                    }if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
+                        noticeNumberVO.setRepairCheckNum(new BigDecimal((vo.getRepairCount())));
+                    }
+                    //报修人生产审核
+                }else if(noticeNumberVO.getRoleFlag()==2){
+                    if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
+                        noticeNumberVO.setProduceCheckNum(new BigDecimal(vo.getRepairCount()));
+                    }
+                    //维修主管维修审核
+                }else if(noticeNumberVO.getRoleFlag()==3){
+                    if(vo.getStatus()==RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
+                        noticeNumberVO.setRepairCheckNum(new BigDecimal((vo.getRepairCount())));
+                    }
+                }
                 //待分配
                 if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
                     noticeNumberVO.setWaitForDistributionNum(new BigDecimal(vo.getRepairCount()));
@@ -125,10 +143,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 } else if (vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()) {
                     noticeNumberVO.setInTheMaintenanceNum(new BigDecimal(vo.getRepairCount()));
                     //审核中
-                } else if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()) {
-                    noticeNumberVO.setPendingApprovalNum(new BigDecimal(vo.getRepairCount()));
-                    //已完成
-                } else if (vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()) {
+                }else if (vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()) {
                     noticeNumberVO.setFinishedNum(new BigDecimal(vo.getRepairCount()));
                 }
             }