java110 5 år sedan
förälder
incheckning
ea691f9320

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

@@ -78,7 +78,8 @@ public class RepairDto extends PageDto implements Serializable {
     private List<PhotoVo> photos;
 
     private String returnVisitFlag;
-    private String startStaffId;
+    private String startRuId;
+    private String preRuId;
 
 
     public String getRepairName() {
@@ -307,11 +308,19 @@ public class RepairDto extends PageDto implements Serializable {
         this.returnVisitFlag = returnVisitFlag;
     }
 
-    public String getStartStaffId() {
-        return startStaffId;
+    public String getStartRuId() {
+        return startRuId;
     }
 
-    public void setStartStaffId(String startStaffId) {
-        this.startStaffId = startStaffId;
+    public void setStartRuId(String startRuId) {
+        this.startRuId = startRuId;
+    }
+
+    public String getPreRuId() {
+        return preRuId;
+    }
+
+    public void setPreRuId(String preRuId) {
+        this.preRuId = preRuId;
     }
 }

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

@@ -308,7 +308,7 @@
         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,
-        sru.staff_id startStaffId
+        sru.ru_id startRuId,ru.ru_id ruId
         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'