Merge remote-tracking branch 'origin/demo_' into demo_

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

@@ -21,48 +21,48 @@ public class NoticeNumberVO implements Serializable {
 
     //维修
     //维修中
-    private BigDecimal inTheMaintenanceNum;
+    private BigDecimal inTheMaintenanceNum=new BigDecimal(0);
     //待分配
-    private BigDecimal waitForDistributionNum;
+    private BigDecimal waitForDistributionNum=new BigDecimal(0);
     //待审核
 //    private BigDecimal pendingApprovalNum;
 
     //待维修主管审核
-    private BigDecimal repairCheckNum;
+    private BigDecimal repairCheckNum=new BigDecimal(0);
     //待生产审核
-    private BigDecimal produceCheckNum;
+    private BigDecimal produceCheckNum=new BigDecimal(0);
     //已完成
-    private BigDecimal finishedNum;
+    private BigDecimal finishedNum=new BigDecimal(0);
 
     //未执行保养任务
-    private BigDecimal unexectuedMaintenanceNum;
+    private BigDecimal unexectuedMaintenanceNum=new BigDecimal(0);
     //全部保养任务
-    private BigDecimal allBaoYangTaskNum;
+    private BigDecimal allBaoYangTaskNum=new BigDecimal(0);
     //已执行保养任务
-    private BigDecimal executedTaskNum;
+    private BigDecimal executedTaskNum=new BigDecimal(0);
     //超市保养任务
-    private BigDecimal timeOutTaskNum;
+    private BigDecimal timeOutTaskNum=new BigDecimal(0);
 
     //仓库
     //入库
-    private BigDecimal inStoreNum;
+    private BigDecimal inStoreNum=new BigDecimal(0);
     //出库
-    private BigDecimal outStoreNum;
+    private BigDecimal outStoreNum=new BigDecimal(0);
     //盘点
-    private BigDecimal pdNum;
+    private BigDecimal pdNum=new BigDecimal(0);
     //调拨
-    private BigDecimal dbNum;
+    private BigDecimal dbNum=new BigDecimal(0);
 
 
     //待办
     //待审批
-    private BigDecimal waitForExamineNum;
+    private BigDecimal waitForExamineNum=new BigDecimal(0);
     //待签收
-    private BigDecimal waitForSignInNum;
+    private BigDecimal waitForSignInNum=new BigDecimal(0);
 
     //通知
     //未读
-    private BigDecimal unreadNum;
+    private BigDecimal unreadNum=new BigDecimal(0);
 
 
 

platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -328,5 +328,6 @@
             resultType="BigDecimal">
         select count(1) from t_check_job
         where type=2 and receive_overtime=#{receiveOvertime}
+        and check_user_id=#{checkUserId}
     </select>
 </mapper>

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -108,7 +108,6 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
      */
     @Override
     public AbstractPageResultBean<CheckJobVO> selectPageList(CheckJobDTO model, int pageNum, int pageSize) {
-
         if (model.getFilter() != null && DataFilterTypeEnum.SELF.getValue() == model.getFilter().intValue()) {
             UserInfo userInfo = SecurityUtils.getUserInfo();
             model.setCheckUserId(userInfo.getUserId());

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

@@ -117,23 +117,6 @@ 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) {
                 //超级管理员
@@ -171,9 +154,6 @@ 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()){
@@ -211,9 +191,13 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         System.out.println(LocalDateTime.now());
         NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
         //先判断是否超级管理员
-//        UserInfo userInfo=SecurityUtils.getUserInfo();
-        UserInfo userInfo=new UserInfo();
-        userInfo.setSuperAdmin(1);
+        UserInfo userInfo=SecurityUtils.getUserInfo();
+//        UserInfo userInfo=new UserInfo();
+//        userInfo.setSuperAdmin(0);
+//        List list=new ArrayList();
+//        list.add("Maintenance");
+//        userInfo.setUserId("629ec2cc6f900a3658c4726f");
+//        userInfo.setRoleCodes(list);
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
         StoreCheckJobDTO storeCheckJobDTO=new StoreCheckJobDTO();
@@ -242,7 +226,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if(sb.toString().contains(SysRoleCodeEnum.Maintenance.name())){
                 noticeNumberVO.setRoleFlag(1);
                 //维修人员，获取自己名下的维修数量
-               repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
                 repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
                 repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
                 noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);