维修数据统计优化

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

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.platform.activiti.controller.ActivitiController;
-import com.platform.activiti.dao.entity.ActApplyInfo;
 import com.platform.common.bean.DictVO;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.cache.DictCache;
@@ -16,7 +15,6 @@ import com.platform.common.exception.BusinessException;
 import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
-import com.platform.dao.bean.MyPage;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
@@ -26,19 +24,14 @@ import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.dto.store.StoreCheckJobDTO;
 import com.platform.dao.dto.upms.SysUserDTO;
-import com.platform.dao.entity.check.CheckJob;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.repair.RepairReason;
 import com.platform.dao.entity.sb.SbInfo;
-import com.platform.dao.entity.store.InStoreForm;
-import com.platform.dao.entity.store.StoreCheckJob;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
-import com.platform.dao.entity.upms.SysUserDept;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.check.CheckJobMapper;
 import com.platform.dao.mapper.repair.*;
-import com.platform.dao.mapper.sb.SbAllocateApplyMapper;
 import com.platform.dao.mapper.store.InStoreFormMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
 import com.platform.dao.mapper.store.StoreCheckJobMapper;
@@ -70,7 +63,6 @@ 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;
@@ -345,34 +337,28 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             for(SysUserRoleVO vo:sysUserRoleVOS){
                 sb.append(vo.getRoleCode());
             }
-            if(sb.toString().contains(SysRoleCodeEnum.Maintenance.name()) || sb.toString().contains(SysRoleCodeEnum.Maintenance_Leader.name())){
-                noticeNumberVO.setRoleFlag(1);//维修人就是班组长
-
-                //维修人员，获取自己名下的维修数量
-                repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
+            if(sb.toString().contains(SysRoleCodeEnum.MM.name())){
+                //维修主管（区域负责人）
+                noticeNumberVO.setRoleFlag(6);
+//                repairApplicationFormDTO.setDeptId(deptId);
+                repairApplicationFormDTO.setReportLeaderId(userInfo.getUserId());
                 repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
                 noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
                 //保养
-                checkJobDTO.setCheckUserId(userInfo.getUserId());
-                checkJobVOS=checkJobMapper.getCheckJobCount(checkJobDTO);
+                checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
                 checkJobDTO.setReceiveOvertime(true);
                 BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
                 noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?initNum:overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
-            }if(sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){//工程师
+            }else
+            if(sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){//工程师
                 //工程师可派单，可审核维修人和班组长（维修人其实就是班组长）的维修数据
                 noticeNumberVO.setRoleFlag(5);
                 repairApplicationFormDTO.setDispatchUserId(userInfo.getUserId());//派工
                 repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
                 noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
             }
-            if(sb.toString().contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
-                noticeNumberVO.setRoleFlag(2);
-                //报修人
-                repairApplicationFormDTO.setUserId(userInfo.getUserId());
-                repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
-                noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
-            }if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
+            else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
                 //维修管理员,先获取其deptid
                 noticeNumberVO.setRoleFlag(3);
                 String deptId=sysUserDeptMapper.selectDeptIdByUserId(userInfo.getUserId());
@@ -396,21 +382,29 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
                 System.out.println("addCheckJobNums:"+(System.currentTimeMillis()-int4));
             }
-            if(sb.toString().contains(SysRoleCodeEnum.MM.name())){
-                //维修主管（区域负责人）
-                noticeNumberVO.setRoleFlag(6);
-//                repairApplicationFormDTO.setDeptId(deptId);
-                repairApplicationFormDTO.setReportLeaderId(userInfo.getUserId());
+            else if(sb.toString().contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
+                noticeNumberVO.setRoleFlag(2);
+                //报修人
+                repairApplicationFormDTO.setUserId(userInfo.getUserId());
+                repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
+                noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
+            }
+            else if(sb.toString().contains(SysRoleCodeEnum.Maintenance.name()) || sb.toString().contains(SysRoleCodeEnum.Maintenance_Leader.name())){
+                noticeNumberVO.setRoleFlag(1);//维修人就是班组长
+
+                //维修人员，获取自己名下的维修数量
+                repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
                 repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
                 noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
                 //保养
-                checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
+                checkJobDTO.setCheckUserId(userInfo.getUserId());
+                checkJobVOS=checkJobMapper.getCheckJobCount(checkJobDTO);
                 checkJobDTO.setReceiveOvertime(true);
                 BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
                 noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?initNum:overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             }
-            if(sb.toString().contains(CommonConstants.WORKPLACE_STORE_MANAGE) &&!sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE) && !sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) ){
+            else if(sb.toString().contains(CommonConstants.WORKPLACE_STORE_MANAGE) &&!sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE) && !sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) ){
                 //仓库管理员
                 //仓库
                 //入库
@@ -558,7 +552,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         RepairApplicationFormDTO repairApplicationFormDTO=new RepairApplicationFormDTO();
         RepairApplicationFormVO repairApplicationFormVO=new RepairApplicationFormVO();
         int roleFlag=0;
-            if(role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){//工程师
+            if(role.contains(SysRoleCodeEnum.MM.name())){
+                roleFlag= 1;
+                //维修主管即区域负责人
+                repairApplicationFormDTO.setReportLeaderId(userInfo.getUserId());
+            }else if (role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){//工程师
                 roleFlag=6;
                 repairApplicationFormDTO.setDispatchUserId(userInfo.getUserId());
 //                //带派工
@@ -580,10 +578,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 //                repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
 //                repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
 //                repairApplicationFormVO.setRoleFlag(3);
-            }else if (role.contains(SysRoleCodeEnum.MM.name())){
-                roleFlag= 1;
-                //维修主管即区域负责人
-                repairApplicationFormDTO.setReportLeaderId(userInfo.getUserId());
             }
 
         BigDecimal count;