仓库报表

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

@@ -25,7 +25,7 @@ public class NoticeNumberVO implements Serializable {
     //待分配
     private BigDecimal waitForDistributionNum;
     //待审核
-    private BigDecimal pendingApprovalNum;
+//    private BigDecimal pendingApprovalNum;
 
     //待维修主管审核
     private BigDecimal repairCheckNum;

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

@@ -70,6 +70,7 @@ import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.upms.SysUserService;
 import com.platform.service.wechat.util.WeChatMessageUtil;
 import lombok.AllArgsConstructor;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.weekend.Weekend;
@@ -116,35 +117,52 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 
 
     private NoticeNumberVO addRepairNums(NoticeNumberVO noticeNumberVO,List<RepairApplicationFormVO> repairApplicationFormVOS){
+        //超级管理员
+        if(noticeNumberVO.getRoleFlag()==0||noticeNumberVO.getRoleFlag()==3){
+            noticeNumberVO.setInTheMaintenanceNum(new BigDecimal(0));
+            noticeNumberVO.setWaitForDistributionNum(new BigDecimal(0));
+            noticeNumberVO.setRepairCheckNum(new BigDecimal(0));
+            noticeNumberVO.setProduceCheckNum(new BigDecimal(0));
+            noticeNumberVO.setFinishedNum(new BigDecimal(0));
+        }
+        //维修人
+        if(noticeNumberVO.getRoleFlag()==1){
+            noticeNumberVO.setInTheMaintenanceNum(new BigDecimal(0));
+            noticeNumberVO.setFinishedNum(new BigDecimal(0));
+        }
+        //报修人
+        if(noticeNumberVO.getRoleFlag()==2){
+            noticeNumberVO.setProduceCheckNum(new BigDecimal(0));
+        }
         if(repairApplicationFormVOS!=null) {
             for (RepairApplicationFormVO vo : repairApplicationFormVOS) {
                 //超级管理员
                 if (noticeNumberVO.getRoleFlag()==0){
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()) {
-                        noticeNumberVO.setProduceCheckNum(new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
-                        noticeNumberVO.setRepairCheckNum(new BigDecimal((vo.getRepairCount())));
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
                     //报修人生产审核
                 }else if(noticeNumberVO.getRoleFlag()==2){
                     if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
-                        noticeNumberVO.setProduceCheckNum(new BigDecimal(vo.getRepairCount()));
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
                     //维修主管维修审核
                 }else if(noticeNumberVO.getRoleFlag()==3){
                     if(vo.getStatus()==RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
-                        noticeNumberVO.setRepairCheckNum(new BigDecimal((vo.getRepairCount())));
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
                 }
                 //待分配
                 if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-                    noticeNumberVO.setWaitForDistributionNum(new BigDecimal(vo.getRepairCount()));
+                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     //维修中
                 } else if (vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()) {
-                    noticeNumberVO.setInTheMaintenanceNum(new BigDecimal(vo.getRepairCount()));
+                    noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     //审核中
                 }else if (vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()) {
-                    noticeNumberVO.setFinishedNum(new BigDecimal(vo.getRepairCount()));
+                    noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                 }
             }
         }
@@ -153,15 +171,20 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 
     public NoticeNumberVO addCheckJobNums(NoticeNumberVO noticeNumberVO, List<CheckJobVO> checkJobVOS){
         BigDecimal count=new BigDecimal(0);
+        noticeNumberVO.setUnexectuedMaintenanceNum(new BigDecimal(0));
+        noticeNumberVO.setAllBaoYangTaskNum(new BigDecimal(0));
+        noticeNumberVO.setExecutedTaskNum(new BigDecimal(0));
+        noticeNumberVO.setTimeOutTaskNum(new BigDecimal(0));
         for (CheckJobVO vo:checkJobVOS){
             if(vo.getStatus()==CheckJobStatusEnum.NOT_EXECUTE.getValue()){
-                noticeNumberVO.setUnexectuedMaintenanceNum(new BigDecimal(vo.getCountNum()));
+                noticeNumberVO.setUnexectuedMaintenanceNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
             }else if(vo.getStatus()==CheckJobStatusEnum.FINISHED.getValue()){
-                noticeNumberVO.setFinishedNum(new BigDecimal(vo.getCountNum()));
+                noticeNumberVO.setExecutedTaskNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
             }else if(vo.getReceiveOvertime()!=null&&vo.getReceiveOvertime()){
-                noticeNumberVO.setTimeOutTaskNum(new BigDecimal(vo.getCountNum()));
+                noticeNumberVO.setTimeOutTaskNum(vo.getCountNum()==null?new BigDecimal(0):new BigDecimal(vo.getCountNum()));
             }
-            count=new BigDecimal(vo.getCountNum().intValue()+count.intValue());
+            int num=vo.getCountNum()==null?0:vo.getCountNum();
+            count=new BigDecimal(count.intValue()+num);
         }
         noticeNumberVO.setAllBaoYangTaskNum(count);
         return noticeNumberVO;
@@ -169,17 +192,17 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 
     private NoticeNumberVO addStoreNums(NoticeNumberVO noticeNumberVO,InStoreFormDTO inStoreFormDTO,OutStoreFormDTO outStoreFormDTO,StoreCheckJobDTO storeCheckJobDTO){
         BigDecimal inStoreCount=inStoreFormMapper.getInStoreFormCount1(inStoreFormDTO);
-        noticeNumberVO.setInStoreNum(inStoreCount);
+        noticeNumberVO.setInStoreNum(inStoreCount==null?new BigDecimal(0):inStoreCount);
         //出库
         BigDecimal outStoreCount=outStoreFormMapper.getOutStoreFormCount1(outStoreFormDTO);
-        noticeNumberVO.setOutStoreNum(outStoreCount);
+        noticeNumberVO.setOutStoreNum(outStoreCount==null?new BigDecimal(0):outStoreCount);
         //盘点
         BigDecimal storeCheckJobCount=storeCheckJobMapper.getNumByDTO(storeCheckJobDTO);
-        noticeNumberVO.setPdNum(storeCheckJobCount);
+        noticeNumberVO.setPdNum(storeCheckJobCount==null?new BigDecimal(0):storeCheckJobCount);
         //调拨,根据出入库type
         inStoreFormDTO.setType(InStoreTypeEnum.DIAOBO_RUKU.getValue());
         BigDecimal dbCount=inStoreFormMapper.getInStoreFormCount1(inStoreFormDTO);
-        noticeNumberVO.setDbNum(dbCount);
+        noticeNumberVO.setDbNum(dbCount==null?new BigDecimal(0):dbCount);
         return noticeNumberVO;
     }
     @Override
@@ -187,7 +210,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         System.out.println(LocalDateTime.now());
         NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
         //先判断是否超级管理员
-        UserInfo userInfo=SecurityUtils.getUserInfo();
+//        UserInfo userInfo=SecurityUtils.getUserInfo();
+        UserInfo userInfo=new UserInfo();
+        userInfo.setSuperAdmin(1);
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
         StoreCheckJobDTO storeCheckJobDTO=new StoreCheckJobDTO();