总分表与子母表水量确定调整

collect_fees_hdx_api/fees-hdx-api/src/main/java/com/tofly/feesapi/sfgl/service/impl/YyQfmxServiceImpl.java

@@ -2767,26 +2767,8 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
     }
 
     public void ZfborZmb(String type, List<String> value) {
-        LambdaQueryChainWrapper<YyCblr> eq = cblrService.lambdaQuery();
-        if (type.equals("cbkid")) {
-            eq.in(YyCblr::getCbkid, value);
-        } else if (type.equals("cbb")) {
-            eq.in(YyCblr::getSscbb, value);
-        }
-
         //查询总表
-        List<Map<String, String>> listzfcblr = eq.select(YyCblr::getCbkid)
-                .eq(YyCblr::getCbbz, CbbzEnum.已抄表)
-                .eq(YyCblr::getJsbz, JsbzEnum.未算费)
-                .eq(YyCblr::getShbz, ShbzEnum.审核通过)
-                .inSql(YyCblr::getCbkid, "select a.yhbh||a.cbkh cbkid from yh_bjfl_zb a " + " where a.type_id='1' and a.isdisabled='1'")
-                .orderByAsc(YyCblr::getYhbh, YyCblr::getCbkh)
-                .list().stream().map(e -> {
-                    Map<String, String> map = new HashMap<>();
-                    map.put("cbkid", e.getCbkid());
-                    return map;
-                }).collect(Collectors.toList());
-
+        List<Map<String, String>> listzfcblr = this.executeQuery(type, value, "1");
         if (listzfcblr.size() > 0) {
             // 查询当前总表下属分表
             listzfcblr.forEach(item -> {
@@ -2804,17 +2786,7 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
         }
 
         //查询母表
-        List<Map<String, String>> listzmcblr = eq.select(YyCblr::getCbkid)
-                .eq(YyCblr::getCbbz, CbbzEnum.已抄表)
-                .eq(YyCblr::getJsbz, JsbzEnum.未算费)
-                .eq(YyCblr::getShbz, ShbzEnum.审核通过)
-                .inSql(YyCblr::getCbkid, "select a.yhbh||a.cbkh cbkid from yh_bjfl_zb a " + " where a.type_id='2' and a.isdisabled='1'")
-                .orderByAsc(YyCblr::getYhbh, YyCblr::getCbkh)
-                .list().stream().map(e -> {
-                    Map<String, String> map = new HashMap<>();
-                    map.put("cbkid", e.getCbkid());
-                    return map;
-                }).collect(Collectors.toList());
+        List<Map<String, String>> listzmcblr = this.executeQuery(type, value, "2");
         if (listzmcblr.size() > 0) {
             // 查询当前母表下属子表
             listzmcblr.forEach(item -> {
@@ -2830,7 +2802,34 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
             });
         }
     }
-
+    /**
+     * 可算费总表或母表的查询
+     *
+     * @param type
+     * @param value
+     * @param typeId
+     * @return
+     */
+    private List<Map<String, String>> executeQuery(String type, List<String> value, String typeId) {
+        LambdaQueryChainWrapper<YyCblr> eq = cblrService.lambdaQuery();
+        if (type.equals("cbkid")) {
+            eq.in(YyCblr::getCbkid, value);
+        } else if (type.equals("cbb")) {
+            eq.in(YyCblr::getSscbb, value);
+        }
+        List<Map<String, String>> list = eq.select(YyCblr::getCbkid)
+                .eq(YyCblr::getCbbz, CbbzEnum.已抄表)
+                .eq(YyCblr::getJsbz, JsbzEnum.未算费)
+                .eq(YyCblr::getShbz, ShbzEnum.审核通过)
+                .inSql(YyCblr::getCbkid, String.format("select a.yhbh||a.cbkh cbkid from yh_bjfl_zb a where a.type_id='%s' and a.isdisabled='1'", typeId))
+                .orderByAsc(YyCblr::getYhbh, YyCblr::getCbkh)
+                .list().stream().map(e -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("cbkid", e.getCbkid());
+                    return map;
+                }).collect(Collectors.toList());
+        return list;
+    }
 
 
     @Override