认定处置文件格式修改

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

@@ -78,7 +78,7 @@ public class TdgyController {
      */
     @GetMapping("/idleLandList")
     public RequestResult idleLandList(@Valid @RequestBody IdleLandListVo idleLandListVo) {
-        // RequestResult requestResult = tdgyService.idleLandList(key);
+        RequestResult requestResult = tdgyService.idleLandList(idleLandListVo);
         return null;
     }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/dto/LandIdleConfirmDTO.java

@@ -21,6 +21,9 @@ public class LandIdleConfirmDTO {
     // 是否闲置
     @TableField("is_idle")
     private Boolean isIdle;
+    //  是否处置
+    @TableField("is_disposal")
+    private Boolean isDisposal;
     // 闲置原因
     @TableField("idle_reason")
     private String idleReason;
@@ -33,10 +36,8 @@ public class LandIdleConfirmDTO {
     // 认定依据
     @TableField("confirm_basis")
     private String confirmBasis;
-    // 认定书
-    @TableField("confirm_doc")
-    private String confirmDoc;
-    // 认定照片
-    @TableField(value = "confirm_imgs", typeHandler = StringListTypeHandler.class)
-    private List<String> confirmImgs;
+
+    // 认定文件
+    @TableField(value = "files", typeHandler = StringListTypeHandler.class)
+    private List<String> files;
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/dto/LandIdleDisposalDTO.java

@@ -18,9 +18,9 @@ public class LandIdleDisposalDTO {
     // 土地id
     @TableField("land_id")
     private String landId;
-    //  是否处置
-    @TableField("is_disposal")
-    private Boolean isDisposal;
+    // //  是否处置
+    // @TableField("is_disposal")
+    // private Boolean isDisposal;
     // 处置时间
     @TableField("disposal_time")
     private Date disposalTime;
@@ -30,10 +30,7 @@ public class LandIdleDisposalDTO {
     // 处置情况
     @TableField("disposal_info")
     private String disposalInfo;
-    // 处置书
-    @TableField("disposal_doc")
-    private String disposalDoc;
-    // 处置照片
-    @TableField(value = "disposal_imgs", typeHandler = StringListTypeHandler.class)
-    private List<String> disposalImgs;
+    // 处置文件
+    @TableField(value = "files", typeHandler = StringListTypeHandler.class)
+    private List<String> files;
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/vo/IdleLandListVo.java

@@ -4,6 +4,12 @@ import lombok.Data;
 
 @Data
 public class IdleLandListVo {
-    // 是否认定为闲置土地
-    private Boolean isConfirm;
+    // 是否认定为闲置土地(默认为true)
+    private Boolean isConfirm = true;
+    // 搜索 土地使用权人/土地证号
+    private String key;
+    // 行政区划
+    // TODO 待实现
+    private String xzqh;
+    private String idleReason;
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/vo/LandIdleConfirmVo.java

@@ -23,8 +23,5 @@ public class LandIdleConfirmVo {
     private Date confirmTime;
     // 认定依据
     private String confirmBasis;
-    // 认定书
-    private String confirmDoc;
-    // 认定照片
-    private List<String> confirmImgs;
+    private List<String> files;
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/vo/LandIdleDisposalVo.java

@@ -12,8 +12,8 @@ public class LandIdleDisposalVo {
     // 土地id
     @NotNull(message = "土地id不能为空")
     private String landId;
-    //  是否处置
-    private Boolean isDisposal;
+    // //  是否处置
+    // private Boolean isDisposal;
     // 处置时间
     @JsonFormat(pattern = "yyyy/MM/dd")
     private Date disposalTime;
@@ -21,8 +21,7 @@ public class LandIdleDisposalVo {
     private String disposalMethod;
     // 处置情况
     private String disposalInfo;
-    // 处置书
-    private String disposalDoc;
-    // 处置照片
-    private List<String> disposalImgs;
+    private List<String> files;
+
+    // TODO，重置约定开工时间
 }

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

@@ -2,9 +2,12 @@ package com.onemap.apply.mapper.tdgy;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.onemap.apply.domain.tdgy.dto.LandIdleConfirmDTO;
+import com.onemap.apply.domain.tdgy.vo.IdleLandListVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface LandIdleConfirmMapper extends BaseMapper<LandIdleConfirmDTO> {
-
+    List<String> getLandIds(IdleLandListVo idleLandListVo);
 }

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

@@ -3,6 +3,7 @@ package com.onemap.apply.service.impl.tdgy;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.onemap.apply.domain.tdgy.dto.LandIdleConfirmDTO;
 import com.onemap.apply.domain.tdgy.dto.LandIdleDisposalDTO;
+import com.onemap.apply.domain.tdgy.vo.IdleLandListVo;
 import com.onemap.apply.domain.tdgy.vo.LandIdleConfirmVo;
 import com.onemap.apply.domain.tdgy.vo.LandIdleDisposalVo;
 import com.onemap.apply.mapper.tdgy.LandIdleConfirmMapper;
@@ -67,16 +68,16 @@ public class TdgyServiceImp implements TdgyService {
             // 约定竣工时间
             wrapper.set("ydjgsj", updateTdgyVo.getYdjgsj());
         }
-        if(updateTdgyVo.getSfkg()!=null){
+        if (updateTdgyVo.getSfkg() != null) {
             // 是否开工
             wrapper.set("sfkg", updateTdgyVo.getSfkg());
         }
-        if(updateTdgyVo.getSjkgsj()!=null){
+        if (updateTdgyVo.getSjkgsj() != null) {
             // 实际开工时间
             wrapper.set("sjkgsj", updateTdgyVo.getSjkgsj());
         }
 
-        if (updateTdgyVo.getSfjg()!=null) {
+        if (updateTdgyVo.getSfjg() != null) {
             // 是否竣工
             wrapper.set("sfjg", updateTdgyVo.getSfjg());
         }
@@ -178,7 +179,14 @@ public class TdgyServiceImp implements TdgyService {
         landIdleDisposalMapper.insert(landIdleDisposalDTO);
         return RequestResult.success();
     }
+
     /**
      * 获取闲置土地
      */
+    @Override
+    public RequestResult idleLandList(IdleLandListVo idleLandListVo) {
+
+
+        return null;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.onemap.apply.service.tdgy;
 
+import com.onemap.apply.domain.tdgy.vo.IdleLandListVo;
 import com.onemap.apply.domain.tdgy.vo.LandIdleConfirmVo;
 import com.onemap.apply.domain.tdgy.vo.LandIdleDisposalVo;
 import com.onemap.apply.domain.tdgy.vo.UpdateTdgyVo;
@@ -15,4 +16,6 @@ public interface TdgyService {
     RequestResult addIdleLandConfirm(LandIdleConfirmVo landIdleConfirmVo);
 
     RequestResult addIdleLandDisposal(LandIdleDisposalVo landIdleDisposalVo);
+
+    RequestResult idleLandList(IdleLandListVo idleLandListVo);
 }

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

@@ -2,19 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.apply.mapper.tdgy.LandIdleConfirmMapper">
 
-<!--    <select id="getSuspectedIdleLand" resultType="map">-->
-<!--        SELECT id, xmmc, crmj, ydkgsj-->
-<!--        from tdgy_sj-->
-<!--        WHERE (sfjg!=true or sfjg is null)-->
-<!--        and (NOW() - sjkgsj > INTERVAL '365 days')-->
-<!--        <if test="key != null and key != ''">-->
-<!--            and (xmmc like '%'||#{key}||'%' or srf like '%'||#{key}||'%')-->
-<!--        </if>-->
-<!--        <if test="xzqh != null and xzqh != ''">-->
-<!--            and xzqh = #{xzqh}-->
-<!--        </if>-->
-<!--        limit #{limit} offset #{offset};-->
-<!--    </select>-->
+    <select id="getLandIds" resultType="String">
+        SELECT td.id,td.srf,td.crmj,td.cqzh
+        from t_land_idle_confirm as confirm,tdgy_sj as td
+        WHERE confirm.land_id=td.id and is_idle=#{isConfirm}
+        <if test="key != null and key != ''">
+            and (td.srf like '%'||#{key}||'%' or td.cqzh like '%'||#{key}||'%')
+        </if>
+        <if test="xzqh != null and xzqh != ''">
+            and td.xzqh = #{xzqh}
+        </if>
+        <if test="idleReason != null and idleReason != ''">
+            and confirm.idle_reason = #{idleReason}
+        </if>
+        limit #{limit} offset #{offset};
+    </select>
 
 <!--    <select id="getLandGeometry" resultType="String">-->
 <!--        public.st_asewkt(public.st_union(geom))-->