成果包查询相关接口完善提交

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/utils/StringUtils.java

@@ -667,4 +667,35 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     public static String getStrUUID(Integer num) {
         return RandomStringUtils.random(num, true, false);
     }
+
+    /**
+     * 通过规划类型标识   获取规划类型中文名
+     *
+     * @param ghlx
+     * @return
+     */
+    public static String getGhlx(String ghlx) {
+        switch (ghlx) {
+            case "1":
+                return "评估成果";
+            case "2":
+                return "规划成果";
+            case "3":
+                return "总体规划";
+            case "4":
+                return "详细规划";
+            case "5":
+                return "专项规划";
+            case "6":
+                return "报批项目";
+            case "7":
+                return "苏木乡镇规划";
+            case "8":
+                return "城市更新";
+            case "9":
+                return "村庄规划";
+            default:
+                return "总体规划";
+        }
+    }
 }

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

@@ -66,7 +66,7 @@ public class SbSearchController extends BaseController {
      * @param divisionCode 行政区域代码
      * @return
      */
-    @GetMapping("/getLandMyAttendsData")
+    @RequestMapping("/getLandMyAttendsData")
     public JSONObject getLandMyAttendsData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
         return sbSearchService.getLandMyAttendsData(planType, current, size , divisionCode, subject);
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/cggl/CgglServiceImpl.java

@@ -328,6 +328,7 @@ public class CgglServiceImpl implements CgglService {
                                 jsonObjectMd5.put("md5", fileMd5);
                                 jsonObjectMd5.put("size", totalSliceNum);
                                 jsonObjectMd5.put("new", false);
+                                jsonObjectMd5.put("ghlx", StringUtils.getGhlx(validateEscalationDTO.getPlantype()));
                                 JSONObject reStrMd5 = RInterfaceUtil.getRemote(token, findByMd5Url, jsonObjectMd5, null);
                                 if (reStrMd5 != null && reStrMd5.containsKey("success") && reStrMd5.getBoolean("success")) {
                                     System.out.println(reStrMd5);

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

@@ -66,7 +66,6 @@ public class SbSearchServiceImpl implements SbSearchService {
         return getRequestFileData(reuploadThirdpartyReviseURI, jsonObject);
     }
 
-
     @Override
     public JSONObject getLandGetRevisePageData(Integer planType, Integer current, Integer size, String divisionCode, String subject) {
         JSONObject jsonObject = new JSONObject();
@@ -86,14 +85,14 @@ public class SbSearchServiceImpl implements SbSearchService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("ghlx", getPlanType(planType));
 //        jsonObject.put("planType", planType);
-//        jsonObject.put("current", current);
-//        jsonObject.put("size", size);
-//        if (StringUtils.isNotEmpty(subject)) {
-//            jsonObject.put("subject", subject);
-//        }
-//        if (StringUtils.isNotEmpty(divisionCode)) {
-//            jsonObject.put("divisionCode", divisionCode);
-//        }
+        jsonObject.put("current", current);
+        jsonObject.put("size", size);
+        if (StringUtils.isNotEmpty(subject)) {
+            jsonObject.put("subject", subject);
+        }
+        if (StringUtils.isNotEmpty(divisionCode)) {
+            jsonObject.put("divisionCode", divisionCode);
+        }
         return getRequestData(landMyAttendsDataURI, jsonObject);
     }
 
@@ -102,14 +101,14 @@ public class SbSearchServiceImpl implements SbSearchService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("ghlx", getPlanType(planType));
 //        jsonObject.put("planType", planType);
-//        jsonObject.put("current", current);
-//        jsonObject.put("size", size);
-//        if (StringUtils.isNotEmpty(subject)) {
-//            jsonObject.put("title", subject);
-//        }
-//        if (StringUtils.isNotEmpty(divisionCode)) {
-//            jsonObject.put("divisionCode", divisionCode);
-//        }
+        jsonObject.put("current", current);
+        jsonObject.put("size", size);
+        if (StringUtils.isNotEmpty(subject)) {
+            jsonObject.put("title", subject);
+        }
+        if (StringUtils.isNotEmpty(divisionCode)) {
+            jsonObject.put("divisionCode", divisionCode);
+        }
         return getRequestData(landGetAllTasksURI, jsonObject);
     }