完善

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

@@ -337,4 +337,6 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
     private List<Integer> statusList;
 
     private String dispatchUserId;
+
+    private Integer checkAllFlag;
 }

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

@@ -112,6 +112,9 @@
             <if test="dispatchUserId != null">
                 and application.dispatch_user_id = #{dispatchUserId}
             </if>
+            <if test="checkAllFlag != null and checkAllFlag == 1">
+                and application.check_user_id is not null
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object"

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

@@ -180,6 +180,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
                 statusList.add(RepairApplicationFormStatusEnum.REBACK.getValue());
             }
+            if(record.getSearchType() == 7){
+                // 获取验收人
+                record.setRepairUserId(null);
+                record.setCheckUserId(SecurityUtils.getUserInfo().getUserId());
+            }
             record.setStatusList(statusList);
         }
         // 排除超级用户
@@ -191,6 +196,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         if(userNames.contains(userInfo.getUsername())){
             record.setRepairUserId(null);
             record.setDispatchUserId(null);
+            // 超级可以看到所有待审核的工单
+            if(record.getSearchType() != null && record.getSearchType() == 7){
+                record.setCheckUserId(null);
+                record.setCheckAllFlag(1);
+            }
         }
         return new MyVOPage<>(mapper.selectPageList(record));
     }