水价编码

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/bmgl/entity/dto/BmSjInsert.java

@@ -41,25 +41,25 @@ public class BmSjInsert {
     @ApiModelProperty(value = "阶梯计算类型", position = 21, example = "正常")
     private JtjslxEnum jtjslx;
 
-    @ApiModelProperty(value = "阶梯1水量止数", position = 22, example = "20")
+    @ApiModelProperty(value = "阶梯1水量止数", position = 22, example = "192")
     private BigDecimal jt1Zs;
 
     @ApiModelProperty(value = "阶梯1算费水价", position = 23, example = "3.2")
     private BigDecimal jt1Sj;
 
-    @ApiModelProperty(value = "阶梯2水量止数", position = 24, example = "40")
+    @ApiModelProperty(value = "阶梯2水量止数", position = 24, example = "288")
     private BigDecimal jt2Zs = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "阶梯2算费水价", position = 25, example = "4.3")
     private BigDecimal jt2Sj = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "阶梯3水量止数", position = 26, example = "50")
+    @ApiModelProperty(value = "阶梯3水量止数", position = 26, example = "9999999")
     private BigDecimal jt3Zs = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "阶梯3算费水价", position = 27,  example = "6.4")
     private BigDecimal jt3Sj = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "阶梯4水量止数", position = 28, example = "80")
+    @ApiModelProperty(value = "阶梯4水量止数", position = 28, example = "9999999")
     private BigDecimal jt4Zs = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "阶梯4算费水价", position = 29, example = "9.0")
@@ -71,5 +71,9 @@ public class BmSjInsert {
 
     @ApiModelProperty(value = "垃圾费单价", position = 36, example = "21")
     private BigDecimal ljfdj = BigDecimal.ZERO;
+    @ApiModelProperty(value = "水资源费单价", position = 37, example = "0.2")
+    private BigDecimal szyfdj = BigDecimal.ZERO;
+    @ApiModelProperty(value = "阶梯人口水量", position = 38, example = "60")
+    private BigDecimal jtrksl = BigDecimal.ZERO;
 
 }

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/bmgl/entity/dto/BmSjSelectDto.java

@@ -92,6 +92,14 @@ public class BmSjSelectDto {
      * 垃圾费单价
      */
     private BigDecimal ljfdj;
+    /**
+     * 水资源费单价
+     */
+    private BigDecimal szyfdj;
+    /**
+     * 阶梯人口水量
+     */
+    private BigDecimal jtrksl;
 
     /**
      * 创建时间

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/bmgl/entity/dto/BmSjUpdate.java

@@ -41,25 +41,25 @@ public class BmSjUpdate {
     @ApiModelProperty(value = "阶梯计算类型", position = 21, example = "正常")
     private JtjslxEnum jtjslx;
 
-    @ApiModelProperty(value = "阶梯1水量止数", position = 22, example = "20")
+    @ApiModelProperty(value = "阶梯1水量止数", position = 22, example = "192")
     private BigDecimal jt1Zs;
 
     @ApiModelProperty(value = "阶梯1算费水价", position = 23, example = "3.2")
     private BigDecimal jt1Sj;
 
-    @ApiModelProperty(value = "阶梯2水量止数", position = 24, example = "40")
+    @ApiModelProperty(value = "阶梯2水量止数", position = 24, example = "288")
     private BigDecimal jt2Zs = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "阶梯2算费水价", position = 25, example = "4.3")
     private BigDecimal jt2Sj = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "阶梯3水量止数", position = 26, example = "50")
+    @ApiModelProperty(value = "阶梯3水量止数", position = 26, example = "9999999")
     private BigDecimal jt3Zs = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "阶梯3算费水价", position = 27,  example = "6.4")
     private BigDecimal jt3Sj = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "阶梯4水量止数", position = 28, example = "80")
+    @ApiModelProperty(value = "阶梯4水量止数", position = 28, example = "99999999")
     private BigDecimal jt4Zs = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "阶梯4算费水价", position = 29, example = "9.0")
@@ -71,4 +71,8 @@ public class BmSjUpdate {
 
     @ApiModelProperty(value = "垃圾费单价", position = 36, example = "21")
     private BigDecimal ljfdj = BigDecimal.ZERO;
+    @ApiModelProperty(value = "水资源费单价", position = 37, example = "0.2")
+    private BigDecimal szyfdj = BigDecimal.ZERO;
+    @ApiModelProperty(value = "阶梯人口水量", position = 38, example = "60")
+    private BigDecimal jtrksl = BigDecimal.ZERO;
 }

collect-fees/fees-px-api/src/main/resources/mapper/bmgl/BmSjMapper.xml

@@ -39,12 +39,12 @@
         <result property="jtsffs" column="JTSFFS"/>
         <result property="taxrate" column="TAXRATE"/>
         <result property="szyfdj" column="SZYFDJ"/>
-        <result property="jtrksl" column="jtrk_sl"/>
+        <result property="jtrksl" column="JTRKSL"/>
     </resultMap>
     <sql id="querySql">
         SELECT a.ssgs, a.code, a.name, b.name AS yslxmc,
         a.jtbz, a.sj, a.jt1_zs, a.jt1_sj, a.jt2_zs, a.jt2_sj, a.jt3_zs, a.jt3_sj,
-        a.jt4_zs, a.jt4_sj, a.wsfdj, a.ljfdj,a.szyfdj,a.jtrk_sl as jtrksl, a.czsj
+        a.jt4_zs, a.jt4_sj, a.wsfdj, a.ljfdj,a.szyfdj,a.jtrksl , a.czsj
         FROM BM_SJ a
         LEFT JOIN bm_yslx b on a.yslx=b.code
         WHERE 1=1