优化代码

java110-bean/src/main/java/com/java110/dto/repairReturnVisit/RepairReturnVisitDto.java

@@ -1,6 +1,8 @@
 package com.java110.dto.repairReturnVisit;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.repair.RepairDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,16 +14,17 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class RepairReturnVisitDto extends PageDto implements Serializable {
+public class RepairReturnVisitDto extends RepairDto implements Serializable {
 
     private String visitId;
-private String context;
-private String repairId;
-private String communityId;
-private String visitPersonName;
-private String visitPersonId;
-private String visitType;
+    private String context;
+    private String repairId;
+    private String communityId;
+    private String visitPersonName;
+    private String visitPersonId;
+    private String visitType;
 
+    private String state;
 
     private Date createTime;
 
@@ -31,43 +34,56 @@ private String visitType;
     public String getVisitId() {
         return visitId;
     }
-public void setVisitId(String visitId) {
+
+    public void setVisitId(String visitId) {
         this.visitId = visitId;
     }
-public String getContext() {
+
+    public String getContext() {
         return context;
     }
-public void setContext(String context) {
+
+    public void setContext(String context) {
         this.context = context;
     }
-public String getRepairId() {
+
+    public String getRepairId() {
         return repairId;
     }
-public void setRepairId(String repairId) {
+
+    public void setRepairId(String repairId) {
         this.repairId = repairId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getVisitPersonName() {
+
+    public String getVisitPersonName() {
         return visitPersonName;
     }
-public void setVisitPersonName(String visitPersonName) {
+
+    public void setVisitPersonName(String visitPersonName) {
         this.visitPersonName = visitPersonName;
     }
-public String getVisitPersonId() {
+
+    public String getVisitPersonId() {
         return visitPersonId;
     }
-public void setVisitPersonId(String visitPersonId) {
+
+    public void setVisitPersonId(String visitPersonId) {
         this.visitPersonId = visitPersonId;
     }
-public String getVisitType() {
+
+    public String getVisitType() {
         return visitType;
     }
-public void setVisitType(String visitType) {
+
+    public void setVisitType(String visitType) {
         this.visitType = visitType;
     }
 
@@ -87,4 +103,12 @@ public void setVisitType(String visitType) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

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

@@ -5,120 +5,130 @@
 <mapper namespace="repairReturnVisitServiceDaoImpl">
 
 
-
-
-
     <!-- 保存报修回访信息 add by wuxw 2018-07-03 -->
     <insert id="saveRepairReturnVisitInfo" parameterType="Map">
         insert into r_repair_return_visit(
-visit_id,context,repair_id,community_id,visit_person_name,visit_person_id,visit_type
-) values (
-#{visitId},#{context},#{repairId},#{communityId},#{visitPersonName},#{visitPersonId},#{visitType}
-)
+        visit_id,context,repair_id,community_id,visit_person_name,visit_person_id,visit_type
+        ) values (
+        #{visitId},#{context},#{repairId},#{communityId},#{visitPersonName},#{visitPersonId},#{visitType}
+        )
     </insert>
 
 
-
     <!-- 查询报修回访信息 add by wuxw 2018-07-03 -->
     <select id="getRepairReturnVisitInfo" parameterType="Map" resultType="Map">
-        select  t.visit_id,t.visit_id visitId,t.context,t.repair_id,t.repair_id repairId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.visit_person_name,t.visit_person_name visitPersonName,t.visit_person_id,t.visit_person_id visitPersonId,t.visit_type,t.visit_type visitType 
-from r_repair_return_visit t 
-where 1 =1 
-<if test="visitId !=null and visitId != ''">
-   and t.visit_id= #{visitId}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="repairId !=null and repairId != ''">
-   and t.repair_id= #{repairId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="visitPersonName !=null and visitPersonName != ''">
-   and t.visit_person_name= #{visitPersonName}
-</if> 
-<if test="visitPersonId !=null and visitPersonId != ''">
-   and t.visit_person_id= #{visitPersonId}
-</if> 
-<if test="visitType !=null and visitType != ''">
-   and t.visit_type= #{visitType}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.visit_id,t.visit_id visitId,t.context,t.repair_id
+        statusCd,t.community_id,t.community_id communityId,t.visit_person_name,t.visit_person_name
+        visitPersonName,t.visit_person_id,t.visit_person_id visitPersonId,t.visit_type,t.visit_type visitType,
+        rrp.repair_id repairId,rrp.repair_obj_name repairObjName,rs.repair_type_name repairTypeName,rrp.tel,rrp.repair_name repairName,
+        rrp.appointment_time appointmentTime
+        from r_repair_pool rrp
+        LEFT JOIN r_repair_return_visit t on t.repair_id = rrp.repair_id and t.community_id = rrp.community_id and t.status_cd = '0'
+        left join t_dict d on rrp.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 = rrp.repair_type and rs.status_cd = '0'
+        where 1 = 1
+        and rrp.state = '1800'
+        and rs.return_visit_flag in ('002','003')
+        <if test="state ==null or visitId == ''">
+            and t.repair_id is null
+        </if>
+        <if test="state !=null and visitId != ''">
+            and t.repair_id is not null
+        </if>
+        <if test="visitId !=null and visitId != ''">
+            and t.visit_id= #{visitId}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="repairId !=null and repairId != ''">
+            and rrp.repair_id= #{repairId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="visitPersonName !=null and visitPersonName != ''">
+            and t.visit_person_name= #{visitPersonName}
+        </if>
+        <if test="visitPersonId !=null and visitPersonId != ''">
+            and t.visit_person_id= #{visitPersonId}
+        </if>
+        <if test="visitType !=null and visitType != ''">
+            and t.visit_type= #{visitType}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改报修回访信息 add by wuxw 2018-07-03 -->
     <update id="updateRepairReturnVisitInfo" parameterType="Map">
-        update  r_repair_return_visit t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="context !=null and context != ''">
-, t.context= #{context}
-</if> 
-<if test="repairId !=null and repairId != ''">
-, t.repair_id= #{repairId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="visitPersonName !=null and visitPersonName != ''">
-, t.visit_person_name= #{visitPersonName}
-</if> 
-<if test="visitPersonId !=null and visitPersonId != ''">
-, t.visit_person_id= #{visitPersonId}
-</if> 
-<if test="visitType !=null and visitType != ''">
-, t.visit_type= #{visitType}
-</if> 
- where 1=1 <if test="visitId !=null and visitId != ''">
-and t.visit_id= #{visitId}
-</if> 
+        update r_repair_return_visit t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="context !=null and context != ''">
+            , t.context= #{context}
+        </if>
+        <if test="repairId !=null and repairId != ''">
+            , t.repair_id= #{repairId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="visitPersonName !=null and visitPersonName != ''">
+            , t.visit_person_name= #{visitPersonName}
+        </if>
+        <if test="visitPersonId !=null and visitPersonId != ''">
+            , t.visit_person_id= #{visitPersonId}
+        </if>
+        <if test="visitType !=null and visitType != ''">
+            , t.visit_type= #{visitType}
+        </if>
+        where 1=1
+        <if test="visitId !=null and visitId != ''">
+            and t.visit_id= #{visitId}
+        </if>
 
     </update>
 
     <!-- 查询报修回访数量 add by wuxw 2018-07-03 -->
-     <select id="queryRepairReturnVisitsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from r_repair_return_visit t 
-where 1 =1 
-<if test="visitId !=null and visitId != ''">
-   and t.visit_id= #{visitId}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="repairId !=null and repairId != ''">
-   and t.repair_id= #{repairId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="visitPersonName !=null and visitPersonName != ''">
-   and t.visit_person_name= #{visitPersonName}
-</if> 
-<if test="visitPersonId !=null and visitPersonId != ''">
-   and t.visit_person_id= #{visitPersonId}
-</if> 
-<if test="visitType !=null and visitType != ''">
-   and t.visit_type= #{visitType}
-</if> 
+    <select id="queryRepairReturnVisitsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from r_repair_return_visit t
+        where 1 =1
+        <if test="visitId !=null and visitId != ''">
+            and t.visit_id= #{visitId}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="repairId !=null and repairId != ''">
+            and t.repair_id= #{repairId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="visitPersonName !=null and visitPersonName != ''">
+            and t.visit_person_name= #{visitPersonName}
+        </if>
+        <if test="visitPersonId !=null and visitPersonId != ''">
+            and t.visit_person_id= #{visitPersonId}
+        </if>
+        <if test="visitType !=null and visitType != ''">
+            and t.visit_type= #{visitType}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

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

@@ -13,11 +13,7 @@ import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 报修 控制类
@@ -124,12 +120,18 @@ public class RepairApi {
      */
     @RequestMapping(value = "/queryRepairReturnVisit", method = RequestMethod.GET)
     public ResponseEntity<String> queryRepairReturnVisit(@RequestParam(value = "communityId") String communityId,
+                                                         @RequestParam(value = "repairId") String repairId,
+                                                         @RequestParam(value = "repairName") String repairName,
+                                                         @RequestParam(value = "state") String state,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row) {
         RepairReturnVisitDto repairReturnVisitDto = new RepairReturnVisitDto();
         repairReturnVisitDto.setPage(page);
         repairReturnVisitDto.setRow(row);
         repairReturnVisitDto.setCommunityId(communityId);
+        repairReturnVisitDto.setRepairId(repairId);
+        repairReturnVisitDto.setState(state);
+
         return getRepairReturnVisitBMOImpl.get(repairReturnVisitDto);
     }
 }