优化

platform-dao/src/main/java/com/platform/dao/dto/sbUnused/SbUnusedDTO.java

@@ -22,6 +22,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDTO extends BaseDTO implements Serializable {
+    private Integer hFlag;
     private Boolean saveFlag;//是否提交？true：提交 false：修改
     private List<Integer> statusList;
     private Integer searchType;

platform-dao/src/main/resources/mapper/sbUnused/SbUnusedMapper.xml

@@ -73,6 +73,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="hFlag!=null and hFlag == 1">
+            and unused.status!=1
+        </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sbUnused.SbUnusedDTO" resultType="com.platform.dao.vo.query.sbUnused.SbUnusedVO">
         select unused.*,user.real_name as applyName,user2.real_name as verifyUserName,user3.real_name as verifyUserName2

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

@@ -743,16 +743,20 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private void addSbUnusedNums(List<SbUnusedCount> list,NoticeNumberVO2 noticeNumberVO2,UserInfo userInfo){
         BigDecimal verifyNum = new BigDecimal(0);
         BigDecimal all = new BigDecimal(0);
+        BigDecimal oneVerify = new BigDecimal(0);
+        BigDecimal twoVerify = new BigDecimal(0);
         for (SbUnusedCount count:list){
             if (count.getStatus()==SbUnusedStatusEnum.verifying_one.getValue()){
                 noticeNumberVO2.setVerifyNum(count.getNum());
                 verifyNum = verifyNum.add(count.getNum());
                 all = verifyNum.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());
+                twoVerify = count.getNum();
             }else if (count.getStatus()==SbUnusedStatusEnum.success.getValue()){
                 //报修待审
                 noticeNumberVO2.setFinishXZNum(count.getNum());
@@ -765,9 +769,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             }
         }
         noticeNumberVO2.setAllUnusedNum(all);
-//        if (userInfo.getSuperAdmin()==1){
+        if (userInfo.getSuperAdmin()==1){
             noticeNumberVO2.setVerifyNum(verifyNum);
-//        }
+        }else {
+            if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
+                noticeNumberVO2.setVerifyNum(twoVerify);
+                all = all.subtract(oneVerify);
+                noticeNumberVO2.setAllUnusedNum(all);
+            }else {
+                all = all.subtract(twoVerify);
+                noticeNumberVO2.setAllUnusedNum(all);
+                noticeNumberVO2.setVerifyNum(oneVerify);
+            }
+        }
 
     }
 

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

@@ -345,6 +345,11 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             if (record.getSearchType() == 1) {
                 statusList.add(1);
                 statusList.add(2);
+                if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
+                    statusList = new ArrayList<>();
+                    statusList.add(2);
+                }
+
                 record.setStatusList(statusList);
                 if (userInfo.getSuperAdmin() != 1) {
                     record.setAllUserId(userInfo.getUserId());
@@ -353,10 +358,26 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                 if (userInfo.getSuperAdmin()!=1) {
                     record.setAllUserId(userInfo.getUserId());
                 }
+                if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")){
+                    record.setHFlag(1);
+                }
+            }
+        }else {
+            if (userInfo.getSuperAdmin()!=1){
+                //pc端默认展示自己的单子
+                record.setAllUserId(userInfo.getUserId());
             }
         }
+
         PageHelper.startPage(pageNum, pageSize);
         List<SbUnusedVO> sbUnusedVOS = mapper.selectList(record);
+        if (userInfo.getUserId().equals("636c57bd3abe1415981b18ec")&&record.getSearchType()==2){
+            for (SbUnusedVO vo:sbUnusedVOS){
+                if (vo.getStatus()==SbUnusedStatusEnum.verifying_one.getValue()){
+                    sbUnusedVOS.remove(vo);
+                }
+            }
+        }
         List<SbUnusedDetailVO> sbUnusedDetailVOS = sbUnusedDetailMapper.selectList(null);
         for (SbUnusedVO vo:sbUnusedVOS){
             List<SbUnusedDetailVO> detailVOS = new ArrayList<>();