优化代码

java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java

@@ -43,6 +43,8 @@ public class OwnerCarDto extends PageDto implements Serializable {
     private String carTypeName;
     private String carNum;
     private String carNumLike;
+    private String memberCarNum;
+    private String memberCarNumLike;
     private String[] carNums;
     private String communityId;
     private String psId;
@@ -482,4 +484,20 @@ public class OwnerCarDto extends PageDto implements Serializable {
     public void setMemberCarCount(String memberCarCount) {
         this.memberCarCount = memberCarCount;
     }
+
+    public String getMemberCarNum() {
+        return memberCarNum;
+    }
+
+    public void setMemberCarNum(String memberCarNum) {
+        this.memberCarNum = memberCarNum;
+    }
+
+    public String getMemberCarNumLike() {
+        return memberCarNumLike;
+    }
+
+    public void setMemberCarNumLike(String memberCarNumLike) {
+        this.memberCarNumLike = memberCarNumLike;
+    }
 }

java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -177,6 +177,13 @@
         <if test="carNumLike !=null and carNumLike != ''">
             and t.car_num like  concat('%',#{carNumLike},'%')
         </if>
+
+        <if test="memberCarNum !=null and memberCarNum != ''">
+            and moc.car_num= #{memberCarNum}
+        </if>
+        <if test="memberCarNumLike !=null and memberCarNumLike != ''">
+            and moc.car_num like  concat('%',#{memberCarNumLike},'%')
+        </if>
         <if test="carNums !=null">
             and t.car_num in
             <foreach collection="carNums" item="item" index="index" open="(" close=")" separator=",">
@@ -327,6 +334,9 @@
         left join t_dict t2 on t.state=t2.status_cd and t2.table_name='owner_car' and t2.table_columns = 'state'
         left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
         t.community_id
+        <if test="memberCarNumLike !=null and memberCarNumLike != ''">
+            left join owner_car moc on t.car_id = moc.car_id and moc.car_type_cd != t.car_type_cd and moc.car_type_cd = '1002'
+        </if>
         where 1=1
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd = #{statusCd}
@@ -355,6 +365,12 @@
         <if test="carNumLike !=null and carNumLike != ''">
             and t.car_num like  concat('%',#{carNumLike},'%')
         </if>
+        <if test="memberCarNum !=null and memberCarNum != ''">
+            and moc.car_num= #{memberCarNum}
+        </if>
+        <if test="memberCarNumLike !=null and memberCarNumLike != ''">
+            and moc.car_num like  concat('%',#{memberCarNumLike},'%')
+        </if>
         <if test="carNums !=null">
             and t.car_num in
             <foreach collection="carNums" item="item" index="index" open="(" close=")" separator=",">