优化代码

java110-bean/src/main/java/com/java110/dto/carInoutPayment/CarInoutPaymentDto.java

@@ -23,6 +23,10 @@ public class CarInoutPaymentDto extends PageDto implements Serializable {
     private String communityId;
     private String payCharge;
     private String payTime;
+    private String carNum;
+    private String payTypeName;
+    private String stateName;
+    private String inTime;
 
 
     private Date createTime;
@@ -110,4 +114,36 @@ public class CarInoutPaymentDto extends PageDto implements Serializable {
     public void setPayTime(String payTime) {
         this.payTime = payTime;
     }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getPayTypeName() {
+        return payTypeName;
+    }
+
+    public void setPayTypeName(String payTypeName) {
+        this.payTypeName = payTypeName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getInTime() {
+        return inTime;
+    }
+
+    public void setInTime(String inTime) {
+        this.inTime = inTime;
+    }
 }

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

@@ -20,10 +20,11 @@
         select t.inout_id,t.inout_id inoutId,t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code
         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,
-        ci.in_time inTime,ci.out_time outTime,cip.real_charge realCharge,ci.pa_id paId
+        ci.in_time inTime,ci.out_time outTime,cip.real_charge realCharge,ci.pa_id paId,td.name stateName
         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 ci.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
         where 1 =1
         <if test="inoutId !=null and inoutId != ''">
             and t.inout_id= #{inoutId}

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

@@ -5,120 +5,124 @@
 <mapper namespace="carInoutPaymentV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存车辆支付信息 add by wuxw 2018-07-03 -->
     <insert id="saveCarInoutPaymentInfo" parameterType="Map">
         insert into car_inout_payment(
-real_charge,inout_id,pay_type,payment_id,pa_id,community_id,pay_charge
-) values (
-#{realCharge},#{inoutId},#{payType},#{paymentId},#{paId},#{communityId},#{payCharge}
-)
+        real_charge,inout_id,pay_type,payment_id,pa_id,community_id,pay_charge
+        ) values (
+        #{realCharge},#{inoutId},#{payType},#{paymentId},#{paId},#{communityId},#{payCharge}
+        )
     </insert>
 
 
-
     <!-- 查询车辆支付信息 add by wuxw 2018-07-03 -->
     <select id="getCarInoutPaymentInfo" parameterType="Map" resultType="Map">
-        select  t.real_charge,t.real_charge realCharge,t.inout_id,t.inout_id inoutId,t.pay_type,t.pay_type payType,t.payment_id,t.payment_id paymentId,t.pa_id,t.pa_id paId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.pay_charge,t.pay_charge payCharge 
-from car_inout_payment t 
-where 1 =1 
-<if test="realCharge !=null and realCharge != ''">
-   and t.real_charge= #{realCharge}
-</if> 
-<if test="inoutId !=null and inoutId != ''">
-   and t.inout_id= #{inoutId}
-</if> 
-<if test="payType !=null and payType != ''">
-   and t.pay_type= #{payType}
-</if> 
-<if test="paymentId !=null and paymentId != ''">
-   and t.payment_id= #{paymentId}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</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="payCharge !=null and payCharge != ''">
-   and t.pay_charge= #{payCharge}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.real_charge,t.real_charge realCharge,t.inout_id,t.inout_id inoutId,t.pay_type,t.pay_type
+        payType,t.payment_id,t.payment_id paymentId,t.pa_id,t.pa_id paId,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.pay_charge,t.pay_charge payCharge,ci.car_num carNum,ci.in_time inTime,ci.state,
+        td.`name` stateName,td1.name payTypeName
+        from car_inout_payment 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 t_dict td on ci.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
+        left join t_dict td1 on t.pay_type = td1.status_cd and td1.table_columns='pay_type' and td1.table_name = 'car_inout_payment'
+        where 1 =1
+        <if test="realCharge !=null and realCharge != ''">
+            and t.real_charge= #{realCharge}
+        </if>
+        <if test="inoutId !=null and inoutId != ''">
+            and t.inout_id= #{inoutId}
+        </if>
+        <if test="payType !=null and payType != ''">
+            and t.pay_type= #{payType}
+        </if>
+        <if test="paymentId !=null and paymentId != ''">
+            and t.payment_id= #{paymentId}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </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="payCharge !=null and payCharge != ''">
+            and t.pay_charge= #{payCharge}
+        </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="updateCarInoutPaymentInfo" parameterType="Map">
-        update  car_inout_payment t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="realCharge !=null and realCharge != ''">
-, t.real_charge= #{realCharge}
-</if> 
-<if test="inoutId !=null and inoutId != ''">
-, t.inout_id= #{inoutId}
-</if> 
-<if test="payType !=null and payType != ''">
-, t.pay_type= #{payType}
-</if> 
-<if test="paId !=null and paId != ''">
-, t.pa_id= #{paId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="payCharge !=null and payCharge != ''">
-, t.pay_charge= #{payCharge}
-</if> 
- where 1=1 <if test="paymentId !=null and paymentId != ''">
-and t.payment_id= #{paymentId}
-</if> 
+        update car_inout_payment t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="realCharge !=null and realCharge != ''">
+            , t.real_charge= #{realCharge}
+        </if>
+        <if test="inoutId !=null and inoutId != ''">
+            , t.inout_id= #{inoutId}
+        </if>
+        <if test="payType !=null and payType != ''">
+            , t.pay_type= #{payType}
+        </if>
+        <if test="paId !=null and paId != ''">
+            , t.pa_id= #{paId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="payCharge !=null and payCharge != ''">
+            , t.pay_charge= #{payCharge}
+        </if>
+        where 1=1
+        <if test="paymentId !=null and paymentId != ''">
+            and t.payment_id= #{paymentId}
+        </if>
 
     </update>
 
     <!-- 查询车辆支付数量 add by wuxw 2018-07-03 -->
-     <select id="queryCarInoutPaymentsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from car_inout_payment t 
-where 1 =1 
-<if test="realCharge !=null and realCharge != ''">
-   and t.real_charge= #{realCharge}
-</if> 
-<if test="inoutId !=null and inoutId != ''">
-   and t.inout_id= #{inoutId}
-</if> 
-<if test="payType !=null and payType != ''">
-   and t.pay_type= #{payType}
-</if> 
-<if test="paymentId !=null and paymentId != ''">
-   and t.payment_id= #{paymentId}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</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="payCharge !=null and payCharge != ''">
-   and t.pay_charge= #{payCharge}
-</if> 
+    <select id="queryCarInoutPaymentsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from car_inout_payment 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 t_dict td on ci.state = td.status_cd and td.table_columns='state' and td.table_name = 'car_inout'
+        left join t_dict td1 on t.pay_type = td1.status_cd and td1.table_columns='pay_type' and td1.table_name = 'car_inout_payment'
+        where 1 =1
+        <if test="realCharge !=null and realCharge != ''">
+            and t.real_charge= #{realCharge}
+        </if>
+        <if test="inoutId !=null and inoutId != ''">
+            and t.inout_id= #{inoutId}
+        </if>
+        <if test="payType !=null and payType != ''">
+            and t.pay_type= #{payType}
+        </if>
+        <if test="paymentId !=null and paymentId != ''">
+            and t.payment_id= #{paymentId}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </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="payCharge !=null and payCharge != ''">
+            and t.pay_charge= #{payCharge}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>