替换成正式环境

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

@@ -186,11 +186,6 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
 
     @Override
     public List<TreeAnalyse> getStatistics() {
-        // todo 通过接口调用全部数据
-        // 鄂尔多斯 1506
-        // 通过分页获取全部的数据
-        // sbSearchService.getLandMyAttendsData(2, 1, 10, " 1506", "");
-
         int current = 1;
         List<LandMyAttend.RecordsDTO> list = getAllLandMyAttendsData(2, current, 200, "1506");
         // 根据divisionCode的前9位进行divisionCode分组数量
@@ -306,7 +301,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
         //组织区县数据
         List<TreeAnalyse> countyTreeList = new ArrayList<>();
         for (TusexzqhDTO tusexzqhDTO : countyList) {
-            if(tusexzqhDTO.getCounty().equals("市辖区"))continue;
+            if (tusexzqhDTO.getCounty().equals("市辖区")) continue;
 
             TreeAnalyse treeAnalyse = new TreeAnalyse();
             treeAnalyse.setLevel(1);
@@ -317,7 +312,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 treeAnalyse.setChildren(listCounty);
                 for (TreeAnalyse analyse : listCounty) {
                     //行政村总数
-                    treeAnalyse.setXzczs(analyse.getXzczs()+treeAnalyse.getXzczs());
+                    treeAnalyse.setXzczs(analyse.getXzczs() + treeAnalyse.getXzczs());
                     //旗县已上报的村庄数
                     treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
                     //上报到省厅村庄数
@@ -393,7 +388,10 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
     }
 
     private List<LandMyAttend.RecordsDTO> getAllLandMyAttendsData(int planType, int current, int size, String divisionCode) {
-        JSONObject jsonObject = sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
+        // 正式环境
+        JSONObject jsonObject = sbSearchService.getLandMyAttendsData(planType, current, size, divisionCode, "");
+        // 测试数据
+        // JSONObject 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);