仓库报表

platform-dao/src/main/java/com/platform/dao/dto/check/CheckJobDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class CheckJobDTO extends BaseDTO implements Serializable {
+    private String deptId;
     private String typeId;
     /**
      * 实际执行人姓名

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -29,6 +29,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
 
+    private String deptId;
+
+    private String deptUserId;
+
     private Integer roleFlag;
     /**
      * 1:查询报修单，2：查询维修单

platform-dao/src/main/java/com/platform/dao/dto/store/StoreCheckJobDTO.java

@@ -24,6 +24,7 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class StoreCheckJobDTO extends BaseDTO implements Serializable {
+    private String userId;
 
     /**
      * 主键

platform-dao/src/main/java/com/platform/dao/mapper/check/CheckJobMapper.java

@@ -20,6 +20,8 @@ import java.util.List;
  */
 @Component
 public interface CheckJobMapper extends MyMapper<CheckJob> {
+
+    List<CheckJobVO> getCheckJobCount1(CheckJobDTO checkJobDTO);
     /**
      * 分页查询
      * @param dto

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbAllocateApplyMapper.java

@@ -2,10 +2,12 @@ package com.platform.dao.mapper.sb;
 
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.dto.sb.SbAllocateApplyDTO;
+import com.platform.dao.dto.store.StoreDTO;
 import com.platform.dao.entity.sb.SbAllocateApply;
 import com.platform.dao.vo.query.sb.SbAllocateApplyVO;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -41,4 +43,5 @@ public interface SbAllocateApplyMapper extends MyMapper<SbAllocateApply> {
      * @return :
      */
     List<SbAllocateApplyVO> selectApplyList(SbAllocateApplyDTO dto);
+
 }

platform-dao/src/main/java/com/platform/dao/mapper/store/StoreCheckJobMapper.java

@@ -10,6 +10,7 @@ import com.platform.dao.vo.query.store.StoreCheckJobVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -44,7 +45,7 @@ public interface StoreCheckJobMapper extends MyMapper<StoreCheckJob> {
 
     StoreCheckJobVO selectLastJob(StoreCheckJobDTO job);
 
-    Integer getNumByDTO(StoreCheckJob checkJob);
+    BigDecimal getNumByDTO(StoreCheckJobDTO checkJob);
 
     void updateStatus(StoreCheckJobDTO dto);
 }

platform-dao/src/main/java/com/platform/dao/mapper/upms/SysUserDeptMapper.java

@@ -18,6 +18,8 @@ import java.util.List;
 @Component
 public interface SysUserDeptMapper extends MyMapper<SysUserDept> {
 
+    String selectDeptIdByUserId(String userId);
+
     /**
      * sysUserDeptDTO
      *

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

@@ -25,9 +25,28 @@ public class NoticeNumberVO implements Serializable {
     private BigDecimal waitForDistributionNum;
     //待审核
     private BigDecimal pendingApprovalNum;
+    //已完成
+    private BigDecimal finishedNum;
 
     //未执行保养任务
     private BigDecimal unexectuedMaintenanceNum;
+    //全部保养任务
+    private BigDecimal allBaoYangTaskNum;
+    //已执行保养任务
+    private BigDecimal executedTaskNum;
+    //超市保养任务
+    private BigDecimal timeOutTaskNum;
+
+    //仓库
+    //入库
+    private BigDecimal inStoreNum;
+    //出库
+    private BigDecimal outStoreNum;
+    //盘点
+    private BigDecimal pdNum;
+    //调拨
+    private BigDecimal dbNum;
+
 
     //待办
     //待审批

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

@@ -292,15 +292,35 @@
 
     <select id="getCheckJobCount" parameterType="com.platform.dao.dto.check.CheckJobDTO"
             resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select type,count(0) countNum from t_check_job
+        select status,count(0) countNum from t_check_job
         <where>
-            <if test="status!=null">
-                and status=#{status}
+            <if test="statusList != null and statusList.size > 0">
+            AND status in
+            <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
             </if>
             <if test="checkUserId!=null">
                 and check_user_id=#{checkUserId}
             </if>
-            group by type
+            <if test="type!=null">
+                and type=#{type}
+            </if>
+        </where>
+        group by status
+    </select>
+
+    <select id="getCheckJobCount1" parameterType="com.platform.dao.dto.check.CheckJobDTO"
+            resultType="com.platform.dao.vo.query.check.CheckJobVO">
+        select job.status,count(0) countNum from t_check_job job
+        <where>
+            <if test="checkUserId!=null and checkUserId!=''">
+                and check_user_id in (select user_id from t_sys_user_dept where dept_id=#{deptId})
+            </if>
+            <if test="type!=null">
+                type=#{type}
+            </if>
         </where>
+        group by status
     </select>
 </mapper>

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

@@ -281,11 +281,26 @@
     <select id="getRepairCount" resultType="com.platform.dao.vo.repair.RepairApplicationFormVO"
             parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"
     >
-        select status,count(1) as count  from t_repair_application_form form
+        select status, count(*) repairCount from t_repair_application_form form left JOIN t_sys_user_dept dept ON
+        dept.user_id=form.repair_user_id
         <where>
-            status in (1,2,4)
-            <if test="repairUserId!=null">
-                repair_user_id=#{repairUserId}
+            <if test="statusList != null and statusList.size > 0">
+                AND form.status in
+                <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="userId!=null and userId!=''">
+                form.user_id=#{userId}
+            </if>
+            <if test="repairUserId!=null and repairUserId!=''">
+                form.repair_user_id=#{repairUserId}
+            </if>
+            <if test="dispatchUserId!=null and dispatchUserId!=''">
+                form.dispatch_user_id=#{dispatchUserId}
+            </if>
+            <if test="deptId!=null and deptId!=null">
+                dept.dept_id=#{deptId}
             </if>
         </where>
         group by status
@@ -340,19 +355,22 @@
         select count(*) from t_repair_application_form
         <where>
             <if test="statusList != null and statusList.size > 0">
-                AND status in
+                AND form.status in
                 <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
             <if test="userId!=null and userId!=''">
-                user_id=#{userId}
+                form.user_id=#{userId}
             </if>
             <if test="repairUserId!=null and repairUserId!=''">
-                repair_user_id=#{repairUserId}
+                form.repair_user_id=#{repairUserId}
             </if>
             <if test="dispatchUserId!=null and dispatchUserId!=''">
-                dispatch_user_id=#{dispatchUserId}
+                form.dispatch_user_id=#{dispatchUserId}
+            </if>
+            <if test="status!=null and status!=null">
+                form.status=#{status}
             </if>
         </where>
     </select>

platform-dao/src/main/resources/mapper/sb/SbAllocateApplyMapper.xml

@@ -139,4 +139,5 @@
         </where>
         order by sbAllocateApply.update_time desc
     </select>
+
 </mapper>

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -201,9 +201,20 @@ GROUP BY
 
     <select id="getInStoreFormCount1" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
             resultType="BigDecimal">
-        select count(1) from t_in_store_form form join t_store store
+        select count(1) from t_in_store_form form left join t_store store
         on store.id=form.store_id
-        where user_id=#{userId}
+        <where>
+            <if test="userId!=null and userId!=''">
+                store.user_id=#{userId}>
+            </if>
+            <if test="storeId!=null and storeId!=''">
+                store_id=#{storeId}
+            </if>
+            <if test="type!=null">
+                form.type=#{type}
+            </if>
+
+        </where>
     </select>
 
 

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -178,9 +178,16 @@
 
     <select id="getOutStoreFormCount1" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="BigDecimal">
-        select count(1) from t_out_store_form form join t_store store
+        select count(1) from t_out_store_form form left join t_store store
         on store.id=form.store_id
-        where user_id=#{userId}
+        <where>
+            <if test="userId!=null and userId!=''">
+                store.user_id=#{userId}>
+            </if>
+            <if test="storeId!=null and storeId!=''">
+                form.store_id=#{storeId}
+            </if>
+        </where>
     </select>
 
 </mapper>

platform-dao/src/main/resources/mapper/store/StoreCheckJobMapper.xml

@@ -145,4 +145,16 @@
         set status = #{status}
         where plan_id = #{planId}
     </update>
+
+    <select id="getNumByDTO" parameterType="com.platform.dao.dto.store.StoreCheckJobDTO"
+    resultType="BigDecimal">
+        select count(1) from t_store_check_job job left join t_store store on
+        job.store_id=store.id
+        <where>
+            <if test="userId!=null and userId!=''">
+                and store.user_id=#{userId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

platform-dao/src/main/resources/mapper/upms/SysUserDeptMapper.xml

@@ -74,4 +74,10 @@
             and u.identity_type = #{identityType}
         </if>
     </select>
+
+    <select id="selectDeptIdByUserId" parameterType="String"
+            resultType="String">
+        select dept_id from t_sys_user_dept
+        where user_id=#{id}
+    </select>
 </mapper>

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

@@ -24,18 +24,25 @@ import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 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;
+import com.platform.dao.mapper.upms.SysUserDeptMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.mapper.upms.SysUserRoleMapper;
 import com.platform.dao.mapper.workplace.WorkplaceBacklogMapper;
@@ -103,86 +110,139 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private final ActivitiController activitiController;
     private final InStoreFormMapper inStoreFormMapper;
     private final OutStoreFormMapper outStoreFormMapper;
+    private final StoreCheckJobMapper storeCheckJobMapper;
+    private final SysUserDeptMapper sysUserDeptMapper;
+
+
+
+    private NoticeNumberVO addRepairNums(NoticeNumberVO noticeNumberVO,List<RepairApplicationFormVO> repairApplicationFormVOS){
+        if(repairApplicationFormVOS!=null) {
+            for (RepairApplicationFormVO vo : repairApplicationFormVOS) {
+                //待分配
+                if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
+                    noticeNumberVO.setWaitForDistributionNum(new BigDecimal(vo.getRepairCount()));
+                    //维修中
+                } 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()) {
+                    noticeNumberVO.setFinishedNum(new BigDecimal(vo.getRepairCount()));
+                }
+            }
+        }
+        return noticeNumberVO;
+    }
 
+    public NoticeNumberVO addCheckJobNums(NoticeNumberVO noticeNumberVO, List<CheckJobVO> checkJobVOS){
+        BigDecimal count=new BigDecimal(0);
+        for (CheckJobVO vo:checkJobVOS){
+            if(vo.getStatus()==CheckJobStatusEnum.NOT_EXECUTE.getValue()){
+                noticeNumberVO.setUnexectuedMaintenanceNum(new BigDecimal(vo.getCountNum()));
+            }else if(vo.getStatus()==CheckJobStatusEnum.FINISHED.getValue()){
+                noticeNumberVO.setFinishedNum(new BigDecimal(vo.getCountNum()));
+            }else if(vo.getReceiveOvertime()!=null&&vo.getReceiveOvertime()){
+                noticeNumberVO.setTimeOutTaskNum(new BigDecimal(vo.getCountNum()));
+            }
+            count=new BigDecimal(vo.getCountNum().intValue()+count.intValue());
+        }
+        noticeNumberVO.setAllBaoYangTaskNum(count);
+        return noticeNumberVO;
+    }
 
+    private NoticeNumberVO addStoreNums(NoticeNumberVO noticeNumberVO,InStoreFormDTO inStoreFormDTO,OutStoreFormDTO outStoreFormDTO,StoreCheckJobDTO storeCheckJobDTO){
+        BigDecimal inStoreCount=inStoreFormMapper.getInStoreFormCount1(inStoreFormDTO);
+        noticeNumberVO.setInStoreNum(inStoreCount);
+        //出库
+        BigDecimal outStoreCount=outStoreFormMapper.getOutStoreFormCount1(outStoreFormDTO);
+        noticeNumberVO.setOutStoreNum(outStoreCount);
+        //盘点
+        BigDecimal storeCheckJobCount=storeCheckJobMapper.getNumByDTO(storeCheckJobDTO);
+        noticeNumberVO.setPdNum(storeCheckJobCount);
+        //调拨,根据出入库type
+        inStoreFormDTO.setType(InStoreTypeEnum.DIAOBO_RUKU.getValue());
+        BigDecimal dbCount=inStoreFormMapper.getInStoreFormCount1(inStoreFormDTO);
+        noticeNumberVO.setDbNum(dbCount);
+        return noticeNumberVO;
+    }
     @Override
     public NoticeNumberVO getNoticeNumberVO() {
         System.out.println(LocalDateTime.now());
         NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
         //先判断是否超级管理员
         UserInfo userInfo=SecurityUtils.getUserInfo();
-        //根据userId获取所有权限
-        List<SysUserRoleVO> sysUserRoleVOS = sysUserRoleMapper.selectRoleListByUserId(userInfo.getUserId());
-//        List<SysUserRoleVO> sysUserRoleVOS = sysUserRoleMapper.selectRoleListByUserId("1");
-        List<RepairApplicationFormVO> repairApplicationFormVOS= mapper.getRepairCount(null);
+        InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
+        OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
+        StoreCheckJobDTO storeCheckJobDTO=new StoreCheckJobDTO();
+        List<SysUserRoleVO> sysUserRoleVOS;
+        RepairApplicationFormDTO repairApplicationFormDTO=new RepairApplicationFormDTO();
+        List<RepairApplicationFormVO> repairApplicationFormVOS;
+        List<CheckJobVO> checkJobVOS;
         StringBuffer sb=new StringBuffer();
+        CheckJobDTO checkJobDTO=new CheckJobDTO();
+        checkJobDTO.setType(2);
         if(userInfo.getSuperAdmin()==1){
-//            if(1==1){
-
-                //目前有维修、保养、待办、通知，只有维修判定为维修管理员，即看到所有维修数据
-            for(RepairApplicationFormVO vo: repairApplicationFormVOS){
-                if(vo.getStatus()==1){
-                    noticeNumberVO.setWaitForDistributionNum(vo.getCount());
-                }else if(vo.getStatus()==2){
-                    noticeNumberVO.setInTheMaintenanceNum(vo.getCount());
-                }else if(vo.getStatus()==4){
-                    noticeNumberVO.setPendingApprovalNum(vo.getCount());
-                }
-            }
-
+            repairApplicationFormVOS= mapper.getRepairCount(null);
+            checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
+            noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
+            noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
+            noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
         }else {
+            sysUserRoleVOS= sysUserRoleMapper.selectRoleListByUserId(userInfo.getUserId());
             for(SysUserRoleVO vo:sysUserRoleVOS){
                 sb.append(vo.getRoleCode());
             }
-            if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
-                for(RepairApplicationFormVO vo: repairApplicationFormVOS){
-                    if(vo.getStatus()==1){
-                        noticeNumberVO.setWaitForDistributionNum(vo.getCount());
-                    }else if(vo.getStatus()==2){
-                        noticeNumberVO.setInTheMaintenanceNum(vo.getCount());
-                    }else if(vo.getStatus()==4){
-                        noticeNumberVO.setPendingApprovalNum(vo.getCount());
-                    }
-                }
-            }else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_NORMAL)){
-                RepairApplicationFormDTO queryDTO=new RepairApplicationFormDTO();
-//                queryDTO.setRepairUserId("1");
-                queryDTO.setRepairUserId(userInfo.getUserId());
-                List<RepairApplicationFormVO> repairApplicationFormVOS1= mapper.getRepairCount(queryDTO);
-                for(RepairApplicationFormVO vo: repairApplicationFormVOS1){
-                    if(vo.getStatus()==1){
-                        noticeNumberVO.setWaitForDistributionNum(vo.getCount());
-                    }else if(vo.getStatus()==2){
-                        noticeNumberVO.setInTheMaintenanceNum(vo.getCount());
-                    }else if(vo.getStatus()==4){
-                        noticeNumberVO.setPendingApprovalNum(vo.getCount());
-                    }
-                }
+            if(sb.toString().contains(SysRoleCodeEnum.Maintenance.name())){
+                //维修人员，获取自己名下的维修数量
+               repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
+                repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
+                repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
+                noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
+                //保养
+                checkJobDTO.setCheckUserId(userInfo.getUserId());
+                checkJobVOS=checkJobMapper.getCheckJobCount(checkJobDTO);
+                noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
+            } if(sb.toString().contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
+                //报修人
+                repairApplicationFormDTO.setUserId(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
+                String deptId=sysUserDeptMapper.selectDeptIdByUserId(userInfo.getUserId());
+                repairApplicationFormDTO.setDeptId(deptId);
+                repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
+                noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
+                //保养
+                checkJobDTO.setDeptId(deptId);
+                checkJobMapper.getCheckJobCount1(checkJobDTO);
+                checkJobVOS=checkJobMapper.getCheckJobCount1(checkJobDTO);
+                noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             }
-        }
-        CheckJobDTO checkJobDTO=new CheckJobDTO();
-//        checkJobDTO.setCheckUserId("1");
-        checkJobDTO.setCheckUserId(userInfo.getUserId());
-        checkJobDTO.setStatus(CheckJobStatusEnum.NOT_EXECUTE.getValue());
-        //保养
-        List<CheckJobVO> checkJobVOS=checkJobMapper.getCheckJobCount(checkJobDTO);
-        for(CheckJobVO vo: checkJobVOS){
-            if(vo.getType()==2){
-                noticeNumberVO.setUnexectuedMaintenanceNum(new BigDecimal(vo.getCountNum()));
-                break;
+            if(sb.toString().contains("workplace_store")){
+                //仓库管理员
+                //仓库
+                //入库
+                inStoreFormDTO.setUserId(userInfo.getUserId());
+                outStoreFormDTO.setUserId(userInfo.getUserId());
+                storeCheckJobDTO.setUserId(userInfo.getUserId());
+                noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
             }
         }
+
         //待办
         //待签收
-        MyPage<ActApplyInfo> myPage = (MyPage<ActApplyInfo>)(activitiController.showTaskListClaim(1,10).getData());
-        noticeNumberVO.setWaitForSignInNum(new BigDecimal(myPage.getTotal()));
-        //待审批
-        MyPage<ActApplyInfo> myPage1=(MyPage<ActApplyInfo>)(activitiController.showTaskList(1,10).getData());
-        noticeNumberVO.setWaitForExamineNum(new BigDecimal(myPage1.getTotal()));
-        //通知
-//        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount("1");
-        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount(userInfo.getUserId());
-        noticeNumberVO.setUnreadNum(num);
+//        MyPage<ActApplyInfo> myPage = (MyPage<ActApplyInfo>)(activitiController.showTaskListClaim(1,10).getData());
+//        noticeNumberVO.setWaitForSignInNum(new BigDecimal(myPage.getTotal()));
+//        //待审批
+//        MyPage<ActApplyInfo> myPage1=(MyPage<ActApplyInfo>)(activitiController.showTaskList(1,10).getData());
+//        noticeNumberVO.setWaitForExamineNum(new BigDecimal(myPage1.getTotal()));
+//        //通知
+////        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount("1");
+//        BigDecimal num=workplaceBacklogMapper.getWorkplaceBacklogCount(userInfo.getUserId());
+//        noticeNumberVO.setUnreadNum(num);
 
         System.out.println(LocalDateTime.now());
 
@@ -294,14 +354,14 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     public RepairApplicationFormVO getRepairApplicationFormVO() {
         RepairApplicationFormDTO repairApplicationFormDTO=new RepairApplicationFormDTO();
         RepairApplicationFormVO repairApplicationFormVO=new RepairApplicationFormVO();
-        UserInfo userInfo=SecurityUtils.getUserInfo();
-//        UserInfo userInfo=new UserInfo();
-//        List list=new ArrayList();
-//        list.add("维修人员");
-//        list.add("Maintenance");
-//        userInfo.setUserId("629ec2cc6f900a3658c4726f");
-//        userInfo.setRoleCodes(list);
-//        userInfo.setSuperAdmin(0);
+//        UserInfo userInfo=SecurityUtils.getUserInfo();
+        UserInfo userInfo=new UserInfo();
+        List list=new ArrayList();
+        list.add("维修人员");
+        list.add("Maintenance");
+        userInfo.setUserId("629ec5456f900a3658c472b5");
+        userInfo.setRoleCodes(list);
+        userInfo.setSuperAdmin(0);
         // 根据用户的角色来定
         StringBuilder roleCodes = new StringBuilder();
         userInfo.getRoleCodes().forEach(item-> {