水价分页与付费方式分页查询调整

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/bmgl/controller/BmFffsController.java

@@ -87,7 +87,7 @@ public class BmFffsController {
                     .or()
                     .like("oname", searchText); //模糊查询
         }
-        queryWrapper.eq("isdisabled", "1");
+        //queryWrapper.eq("isdisabled", "1");
         // 排序
         List<OrderItem> orders = page.getOrders();
         if (orders.isEmpty()) {

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/bmgl/service/impl/BmSjServiceImpl.java

@@ -218,6 +218,7 @@ public class BmSjServiceImpl extends ServiceImpl<BmSjMapper, BmSj> implements Bm
                     bmSjSelect.setSzyfdj(String.format("%.2f", r.getSzyfdj()));
                     bmSjSelect.setLjfdj(String.format("%.2f", r.getLjfdj()));
                     bmSjSelect.setWsfdj(String.format("%.2f", r.getWsfdj()));
+                    bmSjSelect.setJtrksl(String.format("%.2f", r.getJtrksl()));
                     bmSjSelect.setHjtsj(createHjtsj(r, "<br/>"));
                     return bmSjSelect;
                 })
@@ -238,6 +239,7 @@ public class BmSjServiceImpl extends ServiceImpl<BmSjMapper, BmSj> implements Bm
                     bmSjSelect.setSzyfdj(String.format("%.2f", r.getSzyfdj()));
                     bmSjSelect.setLjfdj(String.format("%.2f", r.getLjfdj()));
                     bmSjSelect.setWsfdj(String.format("%.2f", r.getWsfdj()));
+                    bmSjSelect.setJtrksl(String.format("%.2f", r.getJtrksl()));
                     bmSjSelect.setHjtsj(createHjtsj2(r, "；"));
                     return bmSjSelect;
                 })