水价编码

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

@@ -155,6 +155,17 @@ public class BmSj extends Model<BmSj> {
     @ApiModelProperty(value = "垃圾费单价")
     private BigDecimal ljfdj;
 
+    /**
+     * 水资源费单价
+     */
+    @ApiModelProperty(value = "水资源费单价")
+    private BigDecimal szyfdj;
+    /**
+     * 水资源费单价
+     */
+    @ApiModelProperty(value = "阶梯人口水量")
+    private BigDecimal jtrksl;
+
     /**
      * 备注
      */

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/bmgl/entity/vo/BmSjSelect.java

@@ -41,7 +41,10 @@ public class BmSjSelect implements Serializable {
     @ApiModelProperty(value = "垃圾费单价", position = 11)
     private String ljfdj;
 
-    @ApiModelProperty(value = "创建时间", position = 12, example = "2024-01-30 15:16:36")
+    @ApiModelProperty(value = "水资源费单价", position = 12)
+    private String szyfdj;
+
+    @ApiModelProperty(value = "创建时间", position = 13, example = "2024-01-30 15:16:36")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime czsj;
 }

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/bmgl/entity/vo/BmSjView.java

@@ -72,4 +72,8 @@ public class BmSjView implements Serializable {
 
     @ApiModelProperty(value = "垃圾费单价", position = 36, example = "21")
     private BigDecimal ljfdj = BigDecimal.ZERO;
+    @ApiModelProperty(value = "水资源费单价", position = 37, example = "21")
+    private BigDecimal szyfdj = BigDecimal.ZERO;
+    @ApiModelProperty(value = "阶梯人口水量", position = 38, example = "21")
+    private BigDecimal jtrksl = BigDecimal.ZERO;
 }

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

@@ -9,7 +9,7 @@
     <select id="selectListMap" resultType="java.util.Map">
         select *
         from BM_SJ
-        where 1 = 1
+        where 1 = 1 ORDER BY CODE ASC
     </select>
     <resultMap id="bmSjMap" type="com.tofly.feesapi.bmgl.entity.BmSj">
         <id property="code" column="CODE"/>
@@ -38,11 +38,13 @@
         <result property="jtjslx" column="JTJSLX"/>
         <result property="jtsffs" column="JTSFFS"/>
         <result property="taxrate" column="TAXRATE"/>
+        <result property="szyfdj" column="SZYFDJ"/>
+        <result property="jtrksl" column="jtrk_sl"/>
     </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.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