食言了 这次才是最后一次

src/main/java/com/ebei/screen/service/impl/EbaSystemServiceImpl.java

@@ -598,21 +598,21 @@ public class EbaSystemServiceImpl implements EbaSystemService {
             // 更新是否拆分 是拆分 否不拆分 默认否
             if (StringUtils.isNotBlank(params.get("split"))) {
                 JSONObject obj3 = mongoTemplate.findById(CommonConstants.PARK_SPLIT, JSONObject.class, CommonConstants.PARK_SPLIT);
-                List<String> crmIds2 = obj3 != null ? obj3.getJSONArray("data").toJavaList(String.class) : new JSONArray().toJavaList(String.class);
+                List<String> parkCodeIds = obj3 != null ? obj3.getJSONArray("data").toJavaList(String.class) : new JSONArray().toJavaList(String.class);
                 // 无脑删除 如果拆分则新增
-                crmIds2.remove(params.get("crmId"));
+                parkCodeIds.remove(params.get("parkId"));
                 // 拆分则新增
                 if ("是".equals(params.get("split"))) {
-                    crmIds2.add(params.get("crmId"));
+                    parkCodeIds.add(params.get("parkId"));
                 }
                 // 更新需要拆分的集合
                 Query query3 = new Query();
                 query3.addCriteria(Criteria.where("_id").is(CommonConstants.PARK_SPLIT));
                 Update update3 = new Update();
-                update3.set("data", crmIds2);
+                update3.set("data", parkCodeIds);
                 mongoTemplate.upsert(query3, update3, CommonConstants.PARK_SPLIT);
             }
-            return ResponseBuilder.ok("车场项目顺序调整成功");
+            return ResponseBuilder.ok("车场项目调整成功");
         } else {
             return ResponseBuilder.fail("未找到相关项目");
         }
@@ -710,7 +710,7 @@ public class EbaSystemServiceImpl implements EbaSystemService {
             JSONObject obj3 = mongoTemplate.findById(CommonConstants.PARK_SPLIT, JSONObject.class, CommonConstants.PARK_SPLIT);
             List<String> splitProjects = obj3 != null ? obj3.getJSONArray("data").toJavaList(String.class) : new JSONArray().toJavaList(String.class);
             AtomicInteger i = new AtomicInteger(1);
-            ebeiProjects.forEach(x -> list.add(Levi.by("parkProjectId", data.get(x) == null ? "" : data.get(x)).set("parkProjectName", data.get(x) == null ? "" : parkInfo.get(data.get(x).toString())).set("ebeiProjectId", x).set("ebeiProjectName", crmProjectInfo.getString(x)).set("no", i.getAndIncrement()).set("split", splitProjects.contains(x) ? "是" : "否")));
+            ebeiProjects.forEach(x -> list.add(Levi.by("parkProjectId", data.get(x) == null ? "" : data.get(x)).set("parkProjectName", data.get(x) == null ? "" : parkInfo.get(data.get(x).toString())).set("ebeiProjectId", x).set("ebeiProjectName", crmProjectInfo.getString(x)).set("no", i.getAndIncrement()).set("split", data.get(x) == null ? "否" : (splitProjects.contains(data.get(x)) ? "是" : "否"))));
             Supplier<Stream<Map>> resStream = () -> list.stream();
             List<Map> results = resStream.get().skip((pageBean.getPageNum() - 1) * pageBean.getPageSize()).limit(pageBean.getPageSize()).collect(Collectors.toList());
             return ResponseBuilder.ok(PageBean.<Map>builder().total(resStream.get().count()).row(results).build());

src/main/java/com/ebei/screen/service/impl/ParkSystemServiceImpl.java

@@ -748,9 +748,17 @@ public class ParkSystemServiceImpl implements ParkSystemService {
     public ResponseBean differentPayByPage(DifferentPayPageReq params) {
         String parkCode = params.getParkCode();
         String payType = params.getPayType();
+        String split = "否";
         List<String> parkCodeList = Arrays.asList(parkCode);
         if (StringUtils.isBlank(parkCode)) {
             parkCodeList = ParkUtils.getParkCodeList();
+        } else {
+            // 判断当前查询的parkCode是否需要拆分
+            JSONObject splitObj = mongoTemplate.findById(CommonConstants.PARK_SPLIT, JSONObject.class, CommonConstants.PARK_SPLIT);
+            List<String> splitIds = splitObj != null ? splitObj.getJSONArray("data").toJavaList(String.class) : new JSONArray().toJavaList(String.class);
+            if (CollUtil.isNotEmpty(splitIds) && splitIds.contains(parkCode)) {
+                split = "是";
+            }
         }
         List<Map> result = new ArrayList<>();
         parkCodeList.forEach(code -> {
@@ -767,7 +775,7 @@ public class ParkSystemServiceImpl implements ParkSystemService {
         dataList.forEach(x -> x.put("payTypeName", PayTypeCode.getTypeByCode(x.get("payType").toString())));
         Supplier<Stream<Map>> resStream = () -> dataList.stream();
         List<Map> resultsList = resStream.get().skip((params.getPageNum() - 1) * params.getPageSize()).limit(params.getPageSize()).collect(Collectors.toList());
-        return ResponseBuilder.ok(PageBean.<Map>builder().total(resStream.get().count()).row(resultsList).build());
+        return ResponseBuilder.ok(Levi.by("total", resStream.get().count()).set("row", resultsList).set("split", split));
     }
 
     /**