适配提交

onemap-modules/onemap-api/src/main/java/com/onemap/api/service/impl/ResultSearchServiceImpl.java

@@ -235,6 +235,7 @@ public class ResultSearchServiceImpl implements ResultSearchService {
             if (StringUtils.isNotEmpty(ghlx)) {//待办已办查询
                 JSONObject data = (JSONObject) res.get("data");
                 JSONArray records = (JSONArray) data.get("records");
+                Integer total = (Integer) data.get("total");
                 List<Object> results = new ArrayList<>();
                 for (int i = 0; i < records.size(); i++) {
                     JSONObject cur = (JSONObject) records.get(i);
@@ -246,7 +247,10 @@ public class ResultSearchServiceImpl implements ResultSearchService {
                     curMap.put("ghlx", ghlx);
                     results.add(curMap);
                 }
-                return RequestResult.success(msg, results);
+//                data.put("records", results);
+                RequestResult result = RequestResult.success(msg, results);
+                result.put("total", total);
+                return result;
             } else {//审查记录查询
                 JSONArray records = (JSONArray) res.get("data");
                 List<Object> results = new ArrayList<>();

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/sbjk/SbSearchController.java

@@ -126,8 +126,8 @@ public class SbSearchController extends BaseController {
      */
     @PostMapping("/landMyAttendsData")
     public WebResult landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode) {
-        JSONObject jsonObject= sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
-        return WebResult.success(jsonObject);
+        WebResult jsonObject = sbSearchService.landMyAttendsData(planType, current, size, divisionCode);
+        return jsonObject;
     }
 
     /**

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

@@ -159,7 +159,7 @@ public class SbSearchServiceImpl implements SbSearchService {
     }
 
     @Override
-    public JSONObject landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode) {
+    public WebResult landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode) {
         List<TusexzqhDTO> villageList = tuseXzqhMapper.getAllVillage();
 
         int total = 400;
@@ -184,7 +184,7 @@ public class SbSearchServiceImpl implements SbSearchService {
             object.put("solId", "1108335276203401216");
             object.put("createTime", "2023-10-13 14:40:25");
             object.put("subject", "xxxxx国土空间总体规划");
-            object.put("divisionCode",villageList.get(id).getUse_id());
+            object.put("divisionCode", villageList.get(id).getUse_id());
             object.put("id", id);
             object.put("status", "RUNNING");
             object.put("instId", "1162399447005093888" + i);
@@ -196,15 +196,7 @@ public class SbSearchServiceImpl implements SbSearchService {
         map.put("size", size);
         map.put("current", current);
         map.put("pages", total / size);
-
-        Map<String, Object> mapRet = new HashMap<>();
-        mapRet.put("code", 200);
-        mapRet.put("success", true);
-        mapRet.put("data", map);
-        mapRet.put("msg", "操作成功");
-
-        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(mapRet));
-        return jsonObject;
+        return WebResult.success("查询成功！", map);
     }
 
     @Override

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

@@ -194,6 +194,11 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
 
         Map<String, Map<String, List<String>>> townNodeMap = new HashMap<>();
         for (LandMyAttend.RecordsDTO recordsDTO : list) {
+            String xzqhcode = recordsDTO.getDivisionCode();
+            if(xzqhcode.length() < 9){
+                System.out.println(" xzqhcode.length() < 9 ");
+                continue;
+            }
             String townCode = recordsDTO.getDivisionCode().substring(0, 9);
 
             // 根据乡镇数量分组

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

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface SbSearchService {
 
-    JSONObject landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode);
+    WebResult landMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode);
 
     WebResult landGetAllTasks(Integer planType, Integer current, Integer size, String divisionCode);
 

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/sbjk/TuseXzqhMapper.xml

@@ -5,34 +5,34 @@
 <mapper namespace="com.onemap.apply.mapper.sbjk.TuseXzqhMapper">
     <select id="getAllVillage" resultType="com.onemap.apply.domain.sbjk.TusexzqhDTO">
         SELECT *
-        FROM "T_USE_XZQH"
+        FROM T_USE_XZQH
         WHERE LENGTH("code") = 12
     </select>
     <select id="getAllTownship" resultType="com.onemap.apply.domain.sbjk.TusexzqhDTO">
         SELECT *
-        FROM "T_USE_XZQH"
+        FROM T_USE_XZQH
         WHERE LENGTH("code") = 9
     </select>
     <select id="getAllCounty" resultType="com.onemap.apply.domain.sbjk.TusexzqhDTO">
         SELECT *
-        FROM "T_USE_XZQH"
+        FROM T_USE_XZQH
         WHERE LENGTH("code") = 6
     </select>
     <select id="getAllCity" resultType="com.onemap.apply.domain.sbjk.TusexzqhDTO">
         SELECT *
-        FROM "T_USE_XZQH"
+        FROM T_USE_XZQH
         WHERE LENGTH("code") = 4
     </select>
 
     <select id="getAllVillageNumByPid" resultType="java.lang.Integer">
         SELECT COALESCE(COUNT(*), 0)
-        FROM "T_USE_XZQH"
+        FROM T_USE_XZQH
         WHERE "pid" = #{pid}
     </select>
 
     <select id="getAllVillageNumByUseId" resultType="java.lang.Integer">
         SELECT COALESCE(COUNT(*), 0)
-        FROM "T_USE_XZQH"
+        FROM T_USE_XZQH
         WHERE "use_id" IN
         <foreach collection="useIds" item="useId" open="(" separator="," close=")">
             #{useId}
@@ -41,20 +41,20 @@
 
     <select id="getTownReportNum" resultType="java.lang.Integer">
         SELECT COALESCE(COUNT(*), 0)
-        FROM "T_USE_XZQH"
-        WHERE "use_id" IN (SELECT DISTINCT "XZQ_CODE"
-                           FROM "T_XXGHCGSB"
-                           WHERE LENGTH("XZQ_CODE") = 12
+        FROM T_USE_XZQH
+        WHERE "use_id" IN (SELECT DISTINCT XZQ_CODE
+                           FROM T_XZCZGHCGSB
+                           WHERE LENGTH(XZQ_CODE) = 12
                              AND "XZQ_CODE" LIKE #{pid} || '%')
     </select>
 
     <select id="getTownUnReportVillage" resultType="String">
         select "village"
-        FROM "T_USE_XZQH"
+        FROM T_USE_XZQH
         WHERE "pid" = #{pid}
-          and "use_id" not IN (SELECT DISTINCT "XZQ_CODE"
-                               FROM "T_XXGHCGSB"
-                               WHERE LENGTH("XZQ_CODE") = 12
+          and "use_id" not IN (SELECT DISTINCT XZQ_CODE
+                               FROM T_XZCZGHCGSB
+                               WHERE LENGTH(XZQ_CODE) = 12
                                  AND "XZQ_CODE" LIKE #{pid} || '%')
     </select>
 </mapper>