优化代码

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

@@ -32,6 +32,7 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     private String feeFlag;
     private String preDegrees;
     private String curDegrees;
+    private String primeRate;
 
 
     private Date createTime;
@@ -191,4 +192,12 @@ public class FeeReceiptDetailDto extends PageDto implements Serializable {
     public void setCurDegrees(String curDegrees) {
         this.curDegrees = curDegrees;
     }
+
+    public String getPrimeRate() {
+        return primeRate;
+    }
+
+    public void setPrimeRate(String primeRate) {
+        this.primeRate = primeRate;
+    }
 }

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

@@ -32,12 +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
+        pfd.remark,pf.fee_flag feeFlag,mw.pre_degrees preDegrees,mw.cur_degrees curDegrees,d.name primeRate
         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 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 t.prime_rate = d.status_cd and d.table_name="pay_fee_detail" and  d.table_columns='prime_rate'
         where 1 =1
 
         <if test="area !=null and area != ''">

service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java

@@ -168,6 +168,7 @@ public class SaveMeterWaterCmd extends Cmd {
             payFeePo.setEndTime(reqJson.getString("preReadingTime"));
             payFeePo.setPayerObjId(reqJson.getString("objId"));
             //payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+            payFeePo.setbId("-1");
             payFeePo.setPayerObjType(reqJson.getString("objType"));
             payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
             payFeePo.setState(FeeDto.STATE_DOING);
@@ -240,6 +241,7 @@ public class SaveMeterWaterCmd extends Cmd {
     public void addMeterWater(JSONObject paramInJson) {
         MeterWaterPo meterWaterPo = BeanConvertUtil.covertBean(paramInJson, MeterWaterPo.class);
         meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+
         int flag = meterWaterV1InnerServiceSMOImpl.saveMeterWater(meterWaterPo);
 
         if (flag < 1) {