修改疑似闲置土地获取方式

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/tdgy/TdgyController.java

@@ -34,12 +34,12 @@ public class TdgyController {
      * @return
      */
     @GetMapping("/suspectedIdleLand")
-    public RequestResult getSuspectedIdleLand(String xmmc, String xzqh, Integer pageSize, Integer pageNum) {
+    public RequestResult getSuspectedIdleLand(String key, String xzqh, Integer pageSize, Integer pageNum) {
         Integer limit = 20;
         if (pageSize != null) limit = pageSize;
         Integer offset = 0;
         if (pageNum != null) offset = (pageNum - 1) * limit;
-        RequestResult requestResult = tdgyService.getSuspectedIdleLand(xmmc, xzqh, limit, offset);
+        RequestResult requestResult = tdgyService.getSuspectedIdleLand(key, xzqh, limit, offset);
         return requestResult;
     }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/tdgy/TdgyMapper.java

@@ -10,7 +10,7 @@ import java.util.Map;
 
 @Mapper
 public interface TdgyMapper extends BaseMapper<TdgySjDTO> {
-    List<Map<String, Object>> getSuspectedIdleLand(@Param("xmmc") String xmmc,
+    List<Map<String, Object>> getSuspectedIdleLand(@Param("key") String key,
                                                    @Param("xzqh") String xzqh,
                                                    @Param("limit") Integer limit,
                                                    @Param("offset") Integer offset);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/tdgy/TdgyServiceImp.java

@@ -51,8 +51,8 @@ public class TdgyServiceImp implements TdgyService {
 
     @Slave
     @Override
-    public RequestResult getSuspectedIdleLand(String xmmc, String xzqh, Integer limit, Integer offset) {
-        List<Map<String, Object>> list = tdgyMapper.getSuspectedIdleLand(xmmc, xzqh, limit, offset);
+    public RequestResult getSuspectedIdleLand(String key, String xzqh, Integer limit, Integer offset) {
+        List<Map<String, Object>> list = tdgyMapper.getSuspectedIdleLand(key, xzqh, limit, offset);
 
         RequestResult requestResult = RequestResult.success(list);
         return requestResult;

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/tdgy/TdgyService.java

@@ -6,5 +6,5 @@ import com.onemap.common.core.web.domain.RequestResult;
 public interface TdgyService {
     RequestResult updateTdgy(UpdateTdgyVo updateTdgyVo);
 
-    RequestResult getSuspectedIdleLand(String xmmc, String xzqh, Integer limit, Integer offset);
+    RequestResult getSuspectedIdleLand(String key, String xzqh, Integer limit, Integer offset);
 }

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/tdgy/TdgyMapper.xml

@@ -6,8 +6,8 @@
         from tdgy_sj
         WHERE (sfjg!=true or sfjg is null)
         and (NOW() - sjkgsj > INTERVAL '365 days')
-        <if test="xmmc != null and xmmc != ''">
-            and xmmc like '%'||#{xmmc}||'%'
+        <if test="key != null and key != ''">
+            and (xmmc like '%'||#{key}||'%' or srf like '%'||#{key}||'%')
         </if>
         <if test="xzqh != null and xzqh != ''">
             and xzqh = #{xzqh}