Browse Source

加入 单位

wuxw 3 years ago
parent
commit
ad3c829b2c

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDetailDto.java

@@ -33,6 +33,7 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     private String preDegrees;
     private String curDegrees;
     private String primeRate;
+    private String units;
 
 
     private Date createTime;
@@ -200,4 +201,12 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     public void setPrimeRate(String primeRate) {
         this.primeRate = primeRate;
     }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
 }

+ 3 - 1
java110-db/src/main/resources/mapper/fee/FeeReceiptDetailServiceDaoImplMapper.xml

@@ -32,11 +32,13 @@
         select t.area,t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time
         startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
         communityId,t.receipt_id,t.receipt_id receiptId,t.fee_id,t.fee_id feeId,t.cycle,t.square_price squarePrice,
-        pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees,d.name primeRate
+        pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees,d.name primeRate,
+        pfc.units
         from fee_receipt_detail t
         left join pay_fee_detail pfd on t.detail_id = pfd.detail_id and pfd.status_cd = '0' and t.community_id =
         pfd.community_id
         left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0' and t.community_id = pf.community_id
+        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 t.community_id = mw.community_id
         left join t_dict d on pfd.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and  d.table_columns='prime_rate'
         where 1 =1