优化代码

java110-bean/src/main/java/com/java110/dto/machine/CarInoutDto.java

@@ -45,6 +45,10 @@ public class CarInoutDto extends CarInoutPaymentDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String areaNum;
+    private String feeName;
+    private String feeConfigId;
+
 
     public String getInoutId() {
         return inoutId;
@@ -167,4 +171,28 @@ public class CarInoutDto extends CarInoutPaymentDto implements Serializable {
     public void setCarType(String carType) {
         this.carType = carType;
     }
+
+    public String getAreaNum() {
+        return areaNum;
+    }
+
+    public void setAreaNum(String areaNum) {
+        this.areaNum = areaNum;
+    }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
+
+    public String getFeeConfigId() {
+        return feeConfigId;
+    }
+
+    public void setFeeConfigId(String feeConfigId) {
+        this.feeConfigId = feeConfigId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/tempCarFeeConfig/TempCarFeeConfigAttrDto.java

@@ -19,6 +19,7 @@ public class TempCarFeeConfigAttrDto extends PageDto implements Serializable {
     private String configId;
     private String[] configIds;
     private String specCd;
+    private String specName;
     private String value;
     private String communityId;
 
@@ -92,4 +93,12 @@ public class TempCarFeeConfigAttrDto extends PageDto implements Serializable {
     public void setConfigIds(String[] configIds) {
         this.configIds = configIds;
     }
+
+    public String getSpecName() {
+        return specName;
+    }
+
+    public void setSpecName(String specName) {
+        this.specName = specName;
+    }
 }

java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml

@@ -21,10 +21,13 @@
         machineCode,t.car_inout,t.car_inout carInout,t.pa_id,t.pa_id paId,t.detail_id,t.detail_id
         detailId,t.car_num,t.car_num carNum,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.state,
         ci.in_time inTime,ci.out_time outTime,max(cip.real_charge) realCharge,ci.pa_id paId,td.name stateName,t.remark,t.car_type carType
+        ,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId
         from car_inout_detail t
         left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id
         left join car_inout_payment cip on cip.inout_id = ci.inout_id and cip.community_id = ci.community_id
         left join t_dict td on t.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
+        left join parking_area pa on ci.pa_id = pa.pa_id and pa.status_cd = '0'
+        left join temp_car_fee_config tcfc on pa.pa_id = tcfc.pa_id and tcfc.status_cd = '0'
         where 1 =1
         <if test="inoutId !=null and inoutId != ''">
             and t.inout_id= #{inoutId}
@@ -63,7 +66,7 @@
             and t.community_id= #{communityId}
         </if>
         group by t.inout_id,t.machine_id,t.machine_code,t.car_inout,t.pa_id,t.detail_id,t.car_num,t.status_cd,t.community_id,
-        ci.in_time ,ci.out_time ,ci.pa_id ,td.name,t.remark
+        ci.in_time ,ci.out_time ,ci.pa_id ,td.name,t.remark,pa.num ,tcfc.fee_name ,tcfc.config_id
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}

java110-db/src/main/resources/mapper/common/CarInoutV1ServiceDaoImplMapper.xml

@@ -19,10 +19,12 @@
     <select id="getCarInoutInfo" parameterType="Map" resultType="Map">
         select t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.pa_id,t.pa_id paId,t.car_num,t.car_num
         carNum,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.out_time,t.out_time
-        outTime,td.`name` stateName,max(cid.car_type) carType
+        outTime,td.`name` stateName,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,max(cid.car_type) carType
         from car_inout t
         LEFT JOIN car_inout_detail cid on t.inout_id = cid.inout_id and cid.status_cd = '0' and cid.state in ('100300','100400','100600')
         left join t_dict td on t.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
+        left join parking_area pa on t.pa_id = pa.pa_id and pa.status_cd = '0'
+        left join temp_car_fee_config tcfc on pa.pa_id = tcfc.pa_id and tcfc.status_cd = '0'
         where 1 =1
         <if test="inTime !=null and inTime != ''">
             and t.in_time= #{inTime}
@@ -63,12 +65,11 @@
         <if test="outTime !=null and outTime != ''">
             and t.out_time= #{outTime}
         </if>
-        group by t.in_time,t.inout_id,t.pa_id,t.car_num,t.status_cd,t.state,t.community_id,t.out_time,td.`name`
+        group by t.in_time,t.inout_id,t.pa_id,t.car_num,t.status_cd,t.state,t.community_id,t.out_time,td.`name`,pa.num,tcfc.fee_name,tcfc.config_id
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
 
 

java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml

@@ -79,8 +79,10 @@
     <select id="getTempCarFeeConfigAttrInfo" parameterType="Map" resultType="Map">
         select t.attr_id,t.attr_id attrId,t.create_time,t.create_time createTime,t.config_id,t.config_id
         configId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.value,
-        t.community_id,t.community_id communityId
+        t.community_id,t.community_id communityId,tcfrs.spec_name specName
         from temp_car_fee_config_attr t
+        left join temp_car_fee_config tcfc on t.config_id = tcfc.config_id and tcfc.status_cd = '0'
+        LEFT JOIN temp_car_fee_rule_spec tcfrs on tcfc.rule_id = tcfrs.rule_id and t.spec_cd = tcfrs.spec_id
         where 1 =1
         <if test="attrId !=null and attrId != ''">
             and t.attr_id= #{attrId}