完成报修回访

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

@@ -60,6 +60,15 @@
         <if test="visitType !=null and visitType != ''">
             and t.visit_type= #{visitType}
         </if>
+        <if test="repairType !=null and repairType != ''">
+            and rrp.repair_type= #{repairType}
+        </if>
+        <if test="repairName !=null and repairName != ''">
+            and rrp.repair_name like '%${repairName}%'
+        </if>
+        <if test="tel !=null and tel != ''">
+            and rrp.tel= #{tel}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -122,7 +131,7 @@
             and t.context= #{context}
         </if>
         <if test="repairId !=null and repairId != ''">
-            and t.repair_id= #{repairId}
+            and rrp.repair_id= #{repairId}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and rrp.status_cd= #{statusCd}
@@ -139,6 +148,15 @@
         <if test="visitType !=null and visitType != ''">
             and t.visit_type= #{visitType}
         </if>
+        <if test="repairType !=null and repairType != ''">
+            and rrp.repair_type= #{repairType}
+        </if>
+        <if test="repairName !=null and repairName != ''">
+            and rrp.repair_name like '%${repairName}%'
+        </if>
+        <if test="tel !=null and tel != ''">
+            and rrp.tel= #{tel}
+        </if>
 
 
     </select>

service-community/src/main/java/com/java110/community/api/RepairApi.java

@@ -127,6 +127,8 @@ public class RepairApi {
     public ResponseEntity<String> queryRepairReturnVisit(@RequestParam(value = "communityId") String communityId,
                                                          @RequestParam(value = "repairId",required = false) String repairId,
                                                          @RequestParam(value = "repairName",required = false) String repairName,
+                                                         @RequestParam(value = "tel",required = false) String tel,
+                                                         @RequestParam(value = "repairType",required = false) String repairType,
                                                          @RequestParam(value = "state") String state,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row) {
@@ -135,6 +137,9 @@ public class RepairApi {
         repairReturnVisitDto.setRow(row);
         repairReturnVisitDto.setCommunityId(communityId);
         repairReturnVisitDto.setRepairId(repairId);
+        repairReturnVisitDto.setRepairName(repairName);
+        repairReturnVisitDto.setTel(tel);
+        repairReturnVisitDto.setRepairType(repairType);
         repairReturnVisitDto.setState(state);
 
         return getRepairReturnVisitBMOImpl.get(repairReturnVisitDto);