上报数修改

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/sbjk/XzczghcgsbServiceImpl.java

@@ -233,11 +233,6 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
         //组织乡镇数据
         List<TreeAnalyse> townTreeList = new ArrayList<>();
         for (TusexzqhDTO tusexzqhDTO : townList) {
-            if(tusexzqhDTO.getTownship().equals("大路镇")){
-                System.out.println("大路镇");
-            }
-
-
             Integer villageNum = tuseXzqhMapper.getAllVillageNumByPid(tusexzqhDTO.getCode());
 //            Integer townReportNum = tuseXzqhMapper.getTownReportNum(tusexzqhDTO.getCode());//上报数
             Integer townReportAllNum = tuseXzqhMapper.getTownReportAllNum(tusexzqhDTO.getCode());//颖备案数
@@ -409,43 +404,41 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
         return cityTreeList;
     }
 
+    private List<LandMyAttend.RecordsDTO> getAllLandMyAttendsData(int planType, int current, int size, String divisionCode) {
+        // 正式环境
+        JSONObject jsonObject = sbSearchService.getLandMyAttendsData(planType, current, size, divisionCode, "");
+        List<LandMyAttend.RecordsDTO> list = new ArrayList<>();
+        if (jsonObject.containsKey("success") && jsonObject.getBoolean("success")) {
+            LandMyAttend landMyAttend = jsonObject.getObject("data", LandMyAttend.class);
+            list.addAll(landMyAttend.getRecords());
+            if (current < landMyAttend.getPages() + 1) {
+                list.addAll(getAllLandMyAttendsData(planType, current + 1, size, divisionCode));
+            }
+        }
+        return list;
+    }
+
+
 //    private List<LandMyAttend.RecordsDTO> getAllLandMyAttendsData(int planType, int current, int size, String divisionCode) {
-//        // 正式环境
-//        JSONObject jsonObject = sbSearchService.getLandMyAttendsData(planType, current, size, divisionCode, "");
 //        // 测试数据
-////         JSONObject jsonObject = sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
+//        WebResult jsonObject = sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
 //        List<LandMyAttend.RecordsDTO> list = new ArrayList<>();
-//        if (jsonObject.containsKey("success") && jsonObject.getBoolean("success")) {
-//            LandMyAttend landMyAttend = jsonObject.getObject("data", LandMyAttend.class);
-//            list.addAll(landMyAttend.getRecords());
-//            if (current < landMyAttend.getPages() + 1) {
+//        if (jsonObject.containsKey("success") && (Boolean) jsonObject.get("success")) {
+//            HashMap<String,Object> resMap = (HashMap<String, Object>) jsonObject.get("data");
+//
+//            List<HashMap<String,Object>> getList= (List<HashMap<String, Object>>) resMap.get("records");
+//            for ( Map<String,Object> mapObj: getList) {
+//                ObjectMapper objectMapper = new ObjectMapper();
+//                LandMyAttend.RecordsDTO recordsDTO = objectMapper.convertValue(mapObj, LandMyAttend.RecordsDTO.class);
+//                list.add(recordsDTO);
+//            }
+//
+//            if (current < (Integer)resMap.get("pages") + 1) {
 //                list.addAll(getAllLandMyAttendsData(planType, current + 1, size, divisionCode));
 //            }
 //        }
 //        return list;
 //    }
-
-
-    private List<LandMyAttend.RecordsDTO> getAllLandMyAttendsData(int planType, int current, int size, String divisionCode) {
-        // 测试数据
-        WebResult jsonObject = sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
-        List<LandMyAttend.RecordsDTO> list = new ArrayList<>();
-        if (jsonObject.containsKey("success") && (Boolean) jsonObject.get("success")) {
-            HashMap<String,Object> resMap = (HashMap<String, Object>) jsonObject.get("data");
-
-            List<HashMap<String,Object>> getList= (List<HashMap<String, Object>>) resMap.get("records");
-            for ( Map<String,Object> mapObj: getList) {
-                ObjectMapper objectMapper = new ObjectMapper();
-                LandMyAttend.RecordsDTO recordsDTO = objectMapper.convertValue(mapObj, LandMyAttend.RecordsDTO.class);
-                list.add(recordsDTO);
-            }
-
-            if (current < (Integer)resMap.get("pages") + 1) {
-                list.addAll(getAllLandMyAttendsData(planType, current + 1, size, divisionCode));
-            }
-        }
-        return list;
-    }
     /**
      * 新增记录
      *