优化

platform-rest/src/main/java/com/platform/rest/controller/sbUnused/SbUnusedController.java

@@ -141,7 +141,7 @@ public class SbUnusedController {
    */
   @GetMapping("/page")
   public R<AbstractPageResultBean<SbUnusedVO>> query(SbUnusedDTO sbUnusedDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(sbUnusedService.selectPageList(sbUnusedDTO, pageNum, pageSize));
+      return new R<>(sbUnusedService.selectPageList2(sbUnusedDTO, pageNum, pageSize));
   }
 
   /**

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

@@ -749,29 +749,30 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if (count.getStatus()==SbUnusedStatusEnum.verifying_one.getValue()){
                 noticeNumberVO2.setVerifyNum(count.getNum());
                 verifyNum = verifyNum.add(count.getNum());
-                all = verifyNum.add(count.getNum());
+                all = all.add(count.getNum());
                 oneVerify = count.getNum();
             }else if (count.getStatus()==SbUnusedStatusEnum.verifying_two.getValue()){
                 //待结单
                 noticeNumberVO2.setVerifyNum(count.getNum());
                 verifyNum = verifyNum.add(count.getNum());
-                all = verifyNum.add(count.getNum());
+                all = all.add(count.getNum());
                 twoVerify = count.getNum();
             }else if (count.getStatus()==SbUnusedStatusEnum.success.getValue()){
                 //报修待审
                 noticeNumberVO2.setFinishXZNum(count.getNum());
-                all = verifyNum.add(count.getNum());
+                all = all.add(count.getNum());
             }
             else if (count.getStatus()==SbUnusedStatusEnum.refused.getValue()){
                 //报修待审
                 noticeNumberVO2.setRefuseNum(count.getNum());
-                all = verifyNum.add(count.getNum());
+                all = all.add(count.getNum());
             }
         }
         noticeNumberVO2.setAllUnusedNum(all);
         if (userInfo.getSuperAdmin()==1){
             noticeNumberVO2.setVerifyNum(verifyNum);
-        }else {
+        }
+        else {
             if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
                 noticeNumberVO2.setVerifyNum(twoVerify);
                 all = all.subtract(oneVerify);

platform-service/src/main/java/com/platform/service/sbUnused/SbUnusedService.java

@@ -36,4 +36,6 @@ public interface SbUnusedService extends IBaseService<SbUnused, SbUnusedDTO> {
      */
     AbstractPageResultBean<SbUnusedVO> selectPageList(SbUnusedDTO record, int pageNum, int pageSize);
 
+    AbstractPageResultBean<SbUnusedVO> selectPageList2(SbUnusedDTO record, int pageNum, int pageSize);
+
                                                                                                                 }

platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -6,6 +6,7 @@ import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
+import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
@@ -395,6 +396,60 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
         return new MyPage(sbUnusedVOS);
     }
 
+    @Override
+    public AbstractPageResultBean<SbUnusedVO> selectPageList2(SbUnusedDTO record, int pageNum, int pageSize) {
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+        List<Integer> statusList = new ArrayList<>();
+        if (record.getSearchType()!=null){
+            //来自移动端
+            if (record.getSearchType() == 1){
+                //审核中，根据角色来区分主管审核还是部门负责人审核，超级管理员可看到全部
+                if (userInfo.getSuperAdmin()==1){
+                    statusList.add(1);
+                    statusList.add(2);
+                }else {
+                    if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
+                        statusList.add(2);
+                    }else {
+                        statusList.add(1);
+                    }
+                    record.setAllUserId(userInfo.getUserId());
+                }
+
+            }else if (record.getSearchType()==2){
+
+                if (userInfo.getSuperAdmin()!=1) {
+                        if (userInfo.getSuperAdmin() != 1) {
+                            record.setAllUserId(userInfo.getUserId());
+                            if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
+                                record.setHFlag(1);
+                            }else {
+                                record.setHFlag(2);
+                            }
+                        }
+                }
+            }
+        }else {
+            if (userInfo.getSuperAdmin()!=1){
+                record.setAllUserId(userInfo.getUserId());
+            }
+        }
+        record.setStatusList(statusList);
+        PageHelper.startPage(pageNum, pageSize);
+        List<SbUnusedVO> sbUnusedVOS = mapper.selectList(record);
+
+        List<SbUnusedDetailVO> sbUnusedDetailVOS = sbUnusedDetailMapper.selectList(null);
+        for (SbUnusedVO vo:sbUnusedVOS){
+            List<SbUnusedDetailVO> detailVOS = new ArrayList<>();
+            for (SbUnusedDetailVO detailVO:sbUnusedDetailVOS){
+                if (detailVO.getSbUnusedId().equals(vo.getId())){
+                    detailVOS.add(detailVO);
+                }
+            }
+        }
+        return new MyVOPage<>(sbUnusedVOS);
+    }
+
     @Override
     public AbstractPageResultBean<SbUnused> selectPageInfo(SbUnusedDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -112,7 +112,13 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     @Override
     public List<SysUserVO> getUnusedUsers(SysUserDTO dto) {
         dto.setRoleCode(SysRoleCodeEnum.XZSBSH.name());
-        return mapper.getUnusedUsers(dto);
+        List<SysUserVO> sysUserVOS = mapper.getUnusedUsers(dto);
+        for (SysUserVO vo:sysUserVOS){
+            if (vo.getUserId().equals("636c57bd3abe1415981b18ec")){
+                sysUserVOS.remove(vo);
+            }
+        }
+        return sysUserVOS;
     }
 
     @Override