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

@@ -44,7 +44,10 @@ public class BmSjSelect implements Serializable {
     @ApiModelProperty(value = "水资源费单价", position = 12)
     private String szyfdj;
 
-    @ApiModelProperty(value = "创建时间", position = 13, example = "2024-01-30 15:16:36")
+    @ApiModelProperty(value = "阶梯人口水量", position = 13)
+    private String jtrksl;
+
+    @ApiModelProperty(value = "创建时间", position = 14, 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/service/impl/BmSjServiceImpl.java

@@ -215,6 +215,7 @@ public class BmSjServiceImpl extends ServiceImpl<BmSjMapper, BmSj> implements Bm
                         Company company = companyService.get(Long.valueOf(ssgs));
                         bmSjSelect.setSsgsmc(company.getCompanyName());
                     }
+                    bmSjSelect.setSzyfdj(String.format("%.2f", r.getSzyfdj()));
                     bmSjSelect.setLjfdj(String.format("%.2f", r.getLjfdj()));
                     bmSjSelect.setWsfdj(String.format("%.2f", r.getWsfdj()));
                     bmSjSelect.setHjtsj(createHjtsj(r, "<br/>"));
@@ -234,6 +235,7 @@ public class BmSjServiceImpl extends ServiceImpl<BmSjMapper, BmSj> implements Bm
                         Company company = companyService.get(Long.valueOf(ssgs));
                         bmSjSelect.setSsgsmc(company.getCompanyName());
                     }
+                    bmSjSelect.setSzyfdj(String.format("%.2f", r.getSzyfdj()));
                     bmSjSelect.setLjfdj(String.format("%.2f", r.getLjfdj()));
                     bmSjSelect.setWsfdj(String.format("%.2f", r.getWsfdj()));
                     bmSjSelect.setHjtsj(createHjtsj2(r, "；"));

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 ORDER BY CODE ASC
+        where 1 = 1 ORDER BY to_number(CODE) ASC
     </select>
     <resultMap id="bmSjMap" type="com.tofly.feesapi.bmgl.entity.BmSj">
         <id property="code" column="CODE"/>
@@ -57,6 +57,7 @@
         <if test="filter.ssgs!=null">
             AND a.ssgs=#{filter.ssgs}
         </if>
+        ORDER BY to_number(a.CODE) ASC
     </sql>
     <select id="getPage" resultType="com.tofly.feesapi.bmgl.entity.dto.BmSjSelectDto">
         <include refid="querySql"></include>

collect-fees/fees-px-api/src/main/resources/mapper/yhgl/YhKhjbxxMapper.xml

@@ -57,6 +57,7 @@
         <if test="filter.sscbpq!=null">
             AND sscbpq=#{filter.sscbpq}
         </if>
+        order by yhbh asc
     </sql>
 
     <!--查询已分配抄表本用户-->
@@ -77,6 +78,7 @@
         <if test="filter.sscbpq!=null">
             AND sscbpq=#{filter.sscbpq}
         </if>
+        order by yhbh asc
     </sql>
 
     <sql id="querySql">