优化 回访功能

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

@@ -92,6 +92,8 @@ public class RepairDto extends PageDto implements Serializable {
     private String repairChannel;
     private String maintenanceType;
     private String reqSource;
+    private String visitType;
+    private String visitContext;
     private List<String> repairChannels;
 
     //业主上传维修图片
@@ -432,4 +434,20 @@ public class RepairDto extends PageDto implements Serializable {
     public void setRepairChannels(List<String> repairChannels) {
         this.repairChannels = repairChannels;
     }
+
+    public String getVisitType() {
+        return visitType;
+    }
+
+    public void setVisitType(String visitType) {
+        this.visitType = visitType;
+    }
+
+    public String getVisitContext() {
+        return visitContext;
+    }
+
+    public void setVisitContext(String visitContext) {
+        this.visitContext = visitContext;
+    }
 }

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

@@ -116,13 +116,14 @@
         bId, d.name stateName,t.maintenance_type maintenanceType,t.repair_channel repairChannel,
         rs.repair_type_name repairTypeName,rs.repair_way repairWay,rs.return_visit_flag returnVisitFlag,
         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
+        t.repair_obj_name repairObjName,rrv.visit_type visitType,rrv.context visitContext
         <if test="staffId != null and staffId != ''">
             ,rru.state repairDispatchState,rru.context repairDispatchContext,td.name repairDispatchStateName
         </if>
         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_return_visit rrv on t.repair_id = rrv.repair_id and rrv.community_id = t.community_id and rrv.status_cd = '0'
         <if test="staffId != null and staffId != ''">
             ,r_repair_user rru
             ,t_dict td