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

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

@@ -24,7 +24,7 @@ public class NoticeNumberVO implements Serializable {
                 =this.finishedNum=this.unexectuedMaintenanceNum=this.allBaoYangTaskNum=this.executedTaskNum
                 =this.timeOutTaskNum=this.inStoreNum=this.outStoreNum=this.pdNum=this.dbNum
                 =this.waitForExamineNum=this.waitForSignInNum=this.unreadNum
-                =this.myRepairNum=this.myCheckRepairNum = new BigDecimal(0);
+                =this.myRepairNum=this.myCheckRepairNum =this.waitForReceiveNum= new BigDecimal(0);
     }
 
     //维修
@@ -32,15 +32,15 @@ public class NoticeNumberVO implements Serializable {
     private BigDecimal inTheMaintenanceNum;
     //待分配
     private BigDecimal waitForDistributionNum;
-    //待审核
-//    private BigDecimal pendingApprovalNum;
 
-    //待维修主管审核
+    //待工程师审核
     private BigDecimal repairCheckNum;
     //待生产审核
     private BigDecimal produceCheckNum;
     //已完成
     private BigDecimal finishedNum;
+    //待接单
+    private BigDecimal waitForReceiveNum;
 
     //未执行保养任务
     private BigDecimal unexectuedMaintenanceNum;

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -297,9 +297,15 @@
             <if test="dispatchUserId!=null and dispatchUserId!=''">
                 and form.dispatch_user_id=#{dispatchUserId}
             </if>
-            <if test="deptId!=null and deptId!=null">
+            <if test="deptId!=null and deptId!=''">
                 and dept.dept_id=#{deptId}
             </if>
+            <if test="status!=null">
+                and form.status=#{status}
+            </if>
+            <if test="reportLeaderId!=null and  reportLeaderId!=''">
+                and form.report_leader_id=#{reportLeaderId}
+            </if>
         </where>
         group by status
     </select>
@@ -365,6 +371,9 @@
             <if test="dispatchUserId!=null and dispatchUserId!=''">
                 and form.dispatch_user_id=#{dispatchUserId}
             </if>
+            <if test="reportLeaderId!=null and reportLeaderId!=''">
+                and form.report_leader_id=#{reportLeaderId}
+            </if>
         </where>
         order by form.update_time desc
         limit 1
@@ -392,6 +401,9 @@
             <if test="status!=null and status!=null">
                 and form.status=#{status}
             </if>
+            <if test="reportLeaderId!=null and reportLeaderId!=''">
+                and form.report_leader_id=#{reportLeaderId}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -9,7 +9,6 @@ import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
-import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.enums.RepairApplicationFormTypeEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.util.ExcelUtil;
@@ -25,7 +24,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -379,15 +377,10 @@ public class RepairApplicationFormController {
     public R getRepairApplicationForm() {
 //        UserInfo userInfo=new UserInfo();
 //        List list=new ArrayList();
-//        list.add("workplace_store_normal");
-//        list.add("workplace_store_manage");
-//        list.add("workplace-repair-normal");
-//        list.add("workplace-repair-manage");
-//        list.add("REPAIR_MANAGE");
-//        list.add("REPAIR_EXAMINE");
-//        userInfo.setUserId("629ff44ad2b1150bf0e3f834");
-//        userInfo.setRoleCodes(list);
+//        list.add("MM");
 //        userInfo.setSuperAdmin(0);
+//        userInfo.setUserId("630dc87e8cdeaf4ae4fe1ca9");
+//        userInfo.setRoleCodes(list);
         UserInfo userInfo= SecurityUtils.getUserInfo();
         // 根据用户的角色来定
         StringBuilder roleCodes = new StringBuilder();
@@ -397,7 +390,9 @@ public class RepairApplicationFormController {
         String role = roleCodes.toString();
         if(userInfo.getSuperAdmin()==0) {
             if (role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) || role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name()) ||
-                    role.contains(SysRoleCodeEnum.Maintenance.name())) {
+                    role.contains(SysRoleCodeEnum.Maintenance.name())
+                    || role.contains(SysRoleCodeEnum.Maintenance_Leader.name())
+                    || role.contains(SysRoleCodeEnum.MM.name())) {
                 return new R(repairApplicationFormService.getRepairApplicationFormVO(role,userInfo));
             } else if (role.contains(CommonConstants.WORKPLACE_STORE_NORMAL) || role.contains(CommonConstants.WORKPLACE_STORE_MANAGE)) {
                 return new R(repairApplicationFormService.getStoreForm(userInfo));

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;
@@ -123,9 +115,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 //超级管理员
                 if (noticeNumberVO.getRoleFlag()==0){
                     //报修中
-                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
-                    }
+//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
+//                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+//                    }
                     //维修中
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                         noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
@@ -138,16 +130,16 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
                         noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
-                    //待维修主管审核
+                    //待工程师审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
                         noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                     //报修人
                 }else if(noticeNumberVO.getRoleFlag()==2){
                     //报修中
-                    if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
-                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
-                    }
+//                    if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+//                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+//                    }
                     //待生产审核
                     if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
                         noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
@@ -160,38 +152,97 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                         noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
-                    //维修主管
-                }else if(noticeNumberVO.getRoleFlag()==3){
-                    //带派工
-                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
+                    //维修主管（区域负责人）
+                }else if(noticeNumberVO.getRoleFlag()==6){
+                    //带派工
+//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
+//                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+//                    }
                     //维修中
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                         noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
-                    //待维修主管审核
+                    //待工程师审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
                         noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
-                    //二次派工
-                    if(vo.getStatus() == RepairApplicationFormStatusEnum.REBACK.getValue() || vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue()){
-                        noticeNumberVO.setFinishedNum((noticeNumberVO.getFinishedNum().add(vo.getRepairCount()==null?initNum:vo.getRepairCount())));
+                    //待生产审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
-                    //维修人
-                }else if(noticeNumberVO.getRoleFlag()==1){
+//                    //二次派工
+//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.REBACK.getValue() || vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue()){
+//                        noticeNumberVO.setFinishedNum((noticeNumberVO.getFinishedNum().add(vo.getRepairCount()==null?initNum:vo.getRepairCount())));
+//                    }
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                }else if(noticeNumberVO.getRoleFlag()==1 || noticeNumberVO.getRoleFlag()==1){//维修人就是班组长
                     if(vo.getStatus()==RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                         noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
-                    //待维修主管审核
+                    //待工程师审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                }else if(noticeNumberVO.getRoleFlag()==5){//工程师
+//                    //带派工
+//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
+//                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+//                    }
+                    //维修中
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    //待工程师审核
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
                         noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
+//                    //二次派工
+//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.REBACK.getValue() || vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue()){
+//                        noticeNumberVO.setFinishedNum((noticeNumberVO.getFinishedNum().add(vo.getRepairCount()==null?initNum:vo.getRepairCount())));
+//                    }
                     //已完成
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
                         noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
                 }
+                else if(noticeNumberVO.getRoleFlag()==3){//维修管理员
+                    //带派工
+//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
+//                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+//                    }
+                    //维修中
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    //待工程师审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    //待生产审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+//                    //二次派工
+//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.REBACK.getValue() || vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue()){
+//                        noticeNumberVO.setFinishedNum((noticeNumberVO.getFinishedNum().add(vo.getRepairCount()==null?initNum:vo.getRepairCount())));
+//                    }
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    //维修人
+                }
                 //待分配
 //                if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
 //                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
@@ -211,17 +262,18 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         BigDecimal count=initNum;
 //        noticeNumberVO.setTimeOutTaskNum(initNum);
         for (CheckJobVO vo:checkJobVOS){
-            if(vo.getStatus()==CheckJobStatusEnum.NOT_EXECUTE.getValue()){
+            if(vo.getStatus()==CheckJobStatusEnum.NOT_EXECUTE.getValue()){//未执行保养任务
                 noticeNumberVO.setUnexectuedMaintenanceNum(vo.getCountNum()==null?initNum:vo.getCountNum());
-            }else if(vo.getStatus()==CheckJobStatusEnum.EXECUTING.getValue()){
+            }else if(vo.getStatus()==CheckJobStatusEnum.EXECUTING.getValue()){//已执行保养任务
                 noticeNumberVO.setExecutedTaskNum(vo.getCountNum()==null?initNum:vo.getCountNum());
             }
-            if(vo.getReceiveOvertime()!=null&&vo.getReceiveOvertime()){
+            if(vo.getReceiveOvertime()!=null&&vo.getReceiveOvertime()){//超时保养任务
                 noticeNumberVO.setTimeOutTaskNum(vo.getCountNum()==null?initNum:vo.getCountNum());
             }
             BigDecimal num=vo.getCountNum()==null?initNum:vo.getCountNum();
             count=new BigDecimal(count.intValue()+num.intValue());
         }
+        //全部保养任务
         noticeNumberVO.setAllBaoYangTaskNum(count);
         return noticeNumberVO;
     }
@@ -243,18 +295,13 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     }
     @Override
     public NoticeNumberVO getNoticeNumberVO() {
-        Long t1=System.currentTimeMillis();
         NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
         UserInfo userInfo=SecurityUtils.getUserInfo();
 //        UserInfo userInfo=new UserInfo();
 //        List list=new ArrayList();
-//        list.add("workplace_store_normal");
-//        list.add("workplace_store_manage");
-//        list.add("workplace-repair-normal");
-//        list.add("workplace-repair-manage");
-//        list.add("REPAIR_EXAMINE");
+//        list.add("MM");
 //        userInfo.setSuperAdmin(0);
-//        userInfo.setUserId("62c3f179a5a6383534617ecd");
+//        userInfo.setUserId("630dc87e8cdeaf4ae4fe1ca9");
 //        userInfo.setRoleCodes(list);
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
@@ -266,7 +313,16 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         StringBuffer sb=new StringBuffer();
         CheckJobDTO checkJobDTO=new CheckJobDTO();
         checkJobDTO.setType(2);
-        if(userInfo.getSuperAdmin()==1){
+        //先统计待接单(NOT_ALLOCATED(1))数量，所有人都能看到
+        repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+        repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
+        repairApplicationFormDTO=new RepairApplicationFormDTO();
+        for (RepairApplicationFormVO vo:repairApplicationFormVOS){
+            if(vo.getStatus()==RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+                noticeNumberVO.setWaitForReceiveNum(vo.getRepairCount());
+            }
+        }
+        if(userInfo.getSuperAdmin()==1){//超级管理员
             noticeNumberVO.setRoleFlag(0);
             repairApplicationFormVOS= mapper.getRepairCount(null);
             checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
@@ -281,27 +337,29 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             for(SysUserRoleVO vo:sysUserRoleVOS){
                 sb.append(vo.getRoleCode());
             }
-            if(sb.toString().contains(SysRoleCodeEnum.Maintenance.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_EXAMINE.name())){
-                noticeNumberVO.setRoleFlag(2);
-                //报修人
-                repairApplicationFormDTO.setUserId(userInfo.getUserId());
+            }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(CommonConstants.WORKPLACE_REPAIR_MANAGE) ||sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
-                //维修主管,先获取其deptid
+            }
+            else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
+                //维修管理员,先获取其deptid
                 noticeNumberVO.setRoleFlag(3);
                 String deptId=sysUserDeptMapper.selectDeptIdByUserId(userInfo.getUserId());
 //                repairApplicationFormDTO.setDeptId(deptId);
@@ -324,7 +382,29 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
                 System.out.println("addCheckJobNums:"+(System.currentTimeMillis()-int4));
             }
-            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(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);
+                //保养
+                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);
+            }
+            else if(sb.toString().contains(CommonConstants.WORKPLACE_STORE_MANAGE) &&!sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE) && !sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) ){
                 //仓库管理员
                 //仓库
                 //入库
@@ -347,7 +427,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 ////        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount("1");
         BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount(userInfo.getUserId());
         Long t2=System.currentTimeMillis();
-        System.out.println("getNums:"+(t2-t1));
         noticeNumberVO.setUnreadNum(num);
         return noticeNumberVO;
     }
@@ -470,20 +549,22 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 
     @Override
     public RepairApplicationFormVO getRepairApplicationFormVO(String role,UserInfo userInfo) {
-        Long t1=System.currentTimeMillis();
         RepairApplicationFormDTO repairApplicationFormDTO=new RepairApplicationFormDTO();
         RepairApplicationFormVO repairApplicationFormVO=new RepairApplicationFormVO();
         int roleFlag=0;
-            if(role.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
-                roleFlag=1;
-                // 维修主管
+            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());
 //                //带派工
 //                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
 //                //维修完成
 //                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.FINISHED.getValue());
 //                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REBACK.getValue());
-            }else if(role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
+            }else if(role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){//报修人
                 roleFlag=2;
                 // 报修+终审
                 repairApplicationFormDTO.setUserId(userInfo.getUserId());
@@ -491,8 +572,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 //                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
 //                //保修驳回
 //                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REFUSED_REPAIR.getValue());
-            }else if(role.contains(SysRoleCodeEnum.Maintenance.name())){
-                roleFlag=3;
+            }else if(role.contains(SysRoleCodeEnum.Maintenance.name()) || role.contains(SysRoleCodeEnum.Maintenance_Leader.name())){//维修人
+                roleFlag = 3;//维修人就是班组长
                 repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
 //                repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
 //                repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
@@ -501,18 +582,13 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 
         BigDecimal count;
 
-        Long int4=System.currentTimeMillis();
         repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
-        System.out.println("getFirstRepairApplicationFormVO:"+(System.currentTimeMillis()-int4));
         if(repairApplicationFormVO!=null){
             repairApplicationFormVO.setRoleFlag(roleFlag);
             repairApplicationFormDTO.setStatus(repairApplicationFormVO.getStatus());
-            Long int5=System.currentTimeMillis();
             count=mapper.getRepairCount1(repairApplicationFormDTO);
             repairApplicationFormVO.setRepairCount(count==null?initNum:count);
-            System.out.println("getRepairCount1:"+(System.currentTimeMillis()-int5));
         }
-        System.out.println("getRepairApplicationForm:"+(System.currentTimeMillis()-t1));
         return repairApplicationFormVO;