优化代码

java110-bean/src/main/java/com/java110/dto/repair/RepairDto.java

@@ -78,7 +78,7 @@ public class RepairDto extends PageDto implements Serializable {
     private List<PhotoVo> photos;
 
     private String returnVisitFlag;
-    private String userState;
+    private String startStaffId;
 
 
     public String getRepairName() {
@@ -307,11 +307,11 @@ public class RepairDto extends PageDto implements Serializable {
         this.returnVisitFlag = returnVisitFlag;
     }
 
-    public String getUserState() {
-        return userState;
+    public String getStartStaffId() {
+        return startStaffId;
     }
 
-    public void setUserState(String userState) {
-        this.userState = userState;
+    public void setStartStaffId(String startStaffId) {
+        this.startStaffId = startStaffId;
     }
 }

java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml

@@ -308,11 +308,12 @@
         d.name stateName,
         rs.repair_type_name repairTypeName,rs.repair_way repairWay,
         t.repair_obj_type,t.repair_obj_id,t.repair_obj_name,t.repair_obj_type repairObjType,t.repair_obj_id repairObjId,t.repair_obj_name repairObjName,
-        ru.state userState
+        sru.staff_id startStaffId
         from r_repair_pool t
         left join t_dict d on t.state = d.status_cd and d.table_name = 'r_repair_pool' and d.table_columns = 'state'
         left join r_repair_setting rs on rs.repair_type = t.repair_type and rs.status_cd = '0'
-        left join r_repair_user ru on t.repair_id = ru.repair_id and t.status_cd = 0
+        left join r_repair_user ru on t.repair_id = ru.repair_id and ru.status_cd = 0
+        left join r_repair_user sru on sru.repair_id = ru.repair_id and sru.status_cd = 0 and sru.state = '10005'
         where 1 =1
         and ru.end_time is null
         and ru.state = '10001'