优化代码

java110-bean/src/main/java/com/java110/dto/parkingCouponCar/ParkingCouponCarDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.parkingCouponCar;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,19 +16,25 @@ import java.util.Date;
 public class ParkingCouponCarDto extends PageDto implements Serializable {
 
     private String giveWay;
-private String carNum;
-private String couponShopId;
-private String remark;
-private String couponId;
-private String pccId;
-private String typeCd;
-private String paId;
-private String startTime;
-private String shopId;
-private String state;
-private String endTime;
-private String communityId;
-private String value;
+    private String carNum;
+    private String carNumLike;
+    private String couponShopId;
+    private String remark;
+    private String couponId;
+    private String pccId;
+    private String typeCd;
+    private String typeCdName;
+    private String paId;
+    private String paName;
+    private String startTime;
+    private String shopId;
+    private String shopName;
+    private String shopNameLike;
+    private String state;
+    private String stateName;
+    private String endTime;
+    private String communityId;
+    private String value;
 
 
     private Date createTime;
@@ -38,85 +45,112 @@ private String value;
     public String getGiveWay() {
         return giveWay;
     }
-public void setGiveWay(String giveWay) {
+
+    public void setGiveWay(String giveWay) {
         this.giveWay = giveWay;
     }
-public String getCarNum() {
+
+    public String getCarNum() {
         return carNum;
     }
-public void setCarNum(String carNum) {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
-public String getCouponShopId() {
+
+    public String getCouponShopId() {
         return couponShopId;
     }
-public void setCouponShopId(String couponShopId) {
+
+    public void setCouponShopId(String couponShopId) {
         this.couponShopId = couponShopId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCouponId() {
+
+    public String getCouponId() {
         return couponId;
     }
-public void setCouponId(String couponId) {
+
+    public void setCouponId(String couponId) {
         this.couponId = couponId;
     }
-public String getPccId() {
+
+    public String getPccId() {
         return pccId;
     }
-public void setPccId(String pccId) {
+
+    public void setPccId(String pccId) {
         this.pccId = pccId;
     }
-public String getTypeCd() {
+
+    public String getTypeCd() {
         return typeCd;
     }
-public void setTypeCd(String typeCd) {
+
+    public void setTypeCd(String typeCd) {
         this.typeCd = typeCd;
     }
-public String getPaId() {
+
+    public String getPaId() {
         return paId;
     }
-public void setPaId(String paId) {
+
+    public void setPaId(String paId) {
         this.paId = paId;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getShopId() {
+
+    public String getShopId() {
         return shopId;
     }
-public void setShopId(String shopId) {
+
+    public void setShopId(String shopId) {
         this.shopId = shopId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getValue() {
+
+    public String getValue() {
         return value;
     }
-public void setValue(String value) {
+
+    public void setValue(String value) {
         this.value = value;
     }
 
@@ -136,4 +170,52 @@ public void setValue(String value) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getTypeCdName() {
+        return typeCdName;
+    }
+
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
+
+    public String getPaName() {
+        return paName;
+    }
+
+    public void setPaName(String paName) {
+        this.paName = paName;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getCarNumLike() {
+        return carNumLike;
+    }
+
+    public void setCarNumLike(String carNumLike) {
+        this.carNumLike = carNumLike;
+    }
+
+    public String getShopNameLike() {
+        return shopNameLike;
+    }
+
+    public void setShopNameLike(String shopNameLike) {
+        this.shopNameLike = shopNameLike;
+    }
 }

java110-db/src/main/resources/mapper/acct/ParkingCouponCarV1ServiceDaoImplMapper.xml

@@ -20,8 +20,14 @@
         select t.give_way,t.give_way giveWay,t.car_num,t.car_num carNum,t.coupon_shop_id,t.coupon_shop_id
         couponShopId,t.remark,t.status_cd,t.status_cd statusCd,t.coupon_id,t.coupon_id couponId,t.pcc_id,t.pcc_id
         pccId,t.type_cd,t.type_cd typeCd,t.pa_id,t.pa_id paId,t.start_time,t.start_time startTime,t.shop_id,t.shop_id
-        shopId,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.value
+        shopId,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.value,td.name stateName,td1.name giveWayName,
+        td2.name stateName,t.create_time createTime,pcs.pa_name paName ,pcs.shop_name shopName,pc.`name` couponName
         from parking_coupon_car t
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'parking_coupon_car' and td.table_columns = 'state'
+        left join t_dict td1 on t.give_way = td1.status_cd and td1.table_name = 'parking_coupon_car' and td1.table_columns = 'give_way'
+        left join t_dict td2 on t.state = td2.status_cd and td2.table_name = 'parking_coupon_car' and td2.table_columns = 'give_way'
+        left join parking_coupon_shop pcs on t.coupon_shop_id = pcs.coupon_shop_id and pcs.status_cd = '0'
+        left join parking_coupon pc on t.coupon_id = pc.coupon_id and pc.status_cd = '0'
         where 1 =1
         <if test="giveWay !=null and giveWay != ''">
             and t.give_way= #{giveWay}
@@ -29,6 +35,9 @@
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
         </if>
+        <if test="carNumLike !=null and carNumLike != ''">
+            and t.car_num like concat('%',#{carNumLike},'%')
+        </if>
         <if test="couponShopId !=null and couponShopId != ''">
             and t.coupon_shop_id= #{couponShopId}
         </if>
@@ -41,6 +50,9 @@
         <if test="couponId !=null and couponId != ''">
             and t.coupon_id= #{couponId}
         </if>
+        <if test="couponNameLike !=null and couponNameLike != ''">
+            and pc.`name` like concat('%',#{couponNameLike},'%')
+        </if>
         <if test="pccId !=null and pccId != ''">
             and t.pcc_id= #{pccId}
         </if>
@@ -56,6 +68,9 @@
         <if test="shopId !=null and shopId != ''">
             and t.shop_id= #{shopId}
         </if>
+        <if test="shopNameLike !=null and shopNameLike != ''">
+            and pcs.shop_name like concat('%',#{shopNameLike},'%')
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
@@ -132,6 +147,11 @@
     <select id="queryParkingCouponCarsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from parking_coupon_car t
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'parking_coupon_car' and td.table_columns = 'state'
+        left join t_dict td1 on t.give_way = td1.status_cd and td1.table_name = 'parking_coupon_car' and td1.table_columns = 'give_way'
+        left join t_dict td2 on t.state = td2.status_cd and td2.table_name = 'parking_coupon_car' and td2.table_columns = 'give_way'
+        left join parking_coupon_shop pcs on t.coupon_shop_id = pcs.coupon_shop_id and pcs.status_cd = '0'
+        left join parking_coupon pc on t.coupon_id = pc.coupon_id and pc.status_cd = '0'
         where 1 =1
         <if test="giveWay !=null and giveWay != ''">
             and t.give_way= #{giveWay}
@@ -139,6 +159,9 @@
         <if test="carNum !=null and carNum != ''">
             and t.car_num= #{carNum}
         </if>
+        <if test="carNumLike !=null and carNumLike != ''">
+            and t.car_num like concat('%',#{carNumLike},'%')
+        </if>
         <if test="couponShopId !=null and couponShopId != ''">
             and t.coupon_shop_id= #{couponShopId}
         </if>
@@ -151,6 +174,9 @@
         <if test="couponId !=null and couponId != ''">
             and t.coupon_id= #{couponId}
         </if>
+        <if test="couponNameLike !=null and couponNameLike != ''">
+            and pc.`name` like concat('%',#{couponNameLike},'%')
+        </if>
         <if test="pccId !=null and pccId != ''">
             and t.pcc_id= #{pccId}
         </if>
@@ -166,6 +192,9 @@
         <if test="shopId !=null and shopId != ''">
             and t.shop_id= #{shopId}
         </if>
+        <if test="shopNameLike !=null and shopNameLike != ''">
+            and pcs.shop_name like concat('%',#{shopNameLike},'%')
+        </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>