加入充电规则功能

java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java

@@ -49,6 +49,7 @@ public class FeeDetailDto extends PageDto implements Serializable {
     private String feeId;
     private String bId;
     private String payerObjId;
+    private String payerObjName;
     private String payerObjType;
 
     private Date createTime;
@@ -369,4 +370,12 @@ public class FeeDetailDto extends PageDto implements Serializable {
     public void setPrimeRateName(String primeRateName) {
         this.primeRateName = primeRateName;
     }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    public void setPayerObjName(String payerObjName) {
+        this.payerObjName = payerObjName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -46,6 +46,8 @@ public class ApiFeeDetailDataVo extends Vo {
 
     private String primeRateName;
 
+    private String payerObjName;
+
 
     public String getPrimeRate() {
         return primeRate;
@@ -238,4 +240,12 @@ public class ApiFeeDetailDataVo extends Vo {
     public void setPrimeRateName(String primeRateName) {
         this.primeRateName = primeRateName;
     }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    public void setPayerObjName(String payerObjName) {
+        this.payerObjName = payerObjName;
+    }
 }

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

@@ -121,12 +121,13 @@
         t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value`
         importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
         mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
-        curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName
+        curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName
         from pay_fee_detail t
         left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
         left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
         LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
+        left join pay_fee_attrs pfao1 on pfao1.fee_id = t.fee_id and pfao1.spec_cd = '390012' and pfao1.status_cd = '0'
         <if test="ownerId != null and ownerId != ''">
             left join pay_fee_attrs pfao on pfao.fee_id = t.fee_id and pfao.spec_cd = '390007' and pfao.status_cd = '0'
         </if>