优化代码

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

@@ -20,6 +20,8 @@ public class ParkingCouponCarDto extends PageDto implements Serializable {
     public static final String STATE_FINISH = "2002";
 
     private String giveWay;
+    private String giveWayName;
+
     private String carNum;
     private String carNumLike;
     private String couponShopId;
@@ -231,4 +233,12 @@ public class ParkingCouponCarDto extends PageDto implements Serializable {
     public void setCouponName(String couponName) {
         this.couponName = couponName;
     }
+
+    public String getGiveWayName() {
+        return giveWayName;
+    }
+
+    public void setGiveWayName(String giveWayName) {
+        this.giveWayName = giveWayName;
+    }
 }

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

@@ -21,11 +21,11 @@
         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,td.name stateName,td1.name giveWayName,
-        td2.name stateName,t.create_time createTime,pcs.pa_name paName ,pcs.shop_name shopName,pc.`name` couponName
+        td2.name typeCdName,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 t_dict td2 on t.type_cd = td2.status_cd and td2.table_name = 'parking_coupon_car' and td2.table_columns = 'type_cd'
         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