修改土地供应

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

@@ -71,4 +71,12 @@ public class TdgyController {
         RequestResult requestResult = tdgyService.addIdleLandDisposal(landIdleDisposalVo);
         return requestResult;
     }
+    /**
+     * 闲置土地列表
+     */
+    @GetMapping("/idleLandList")
+    public RequestResult idleLandList(@Param("key") String key) {
+        // RequestResult requestResult = tdgyService.idleLandList(key);
+        return null;
+    }
 }

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

@@ -22,8 +22,22 @@ public class UpdateTdgyVo {
     @JsonProperty("ydkgsj")
     @JsonFormat(pattern = "yyyy/MM/dd")
     private Date ydkgsj;
+
     // 约定竣工时间
     @JsonProperty("ydjgsj")
     @JsonFormat(pattern = "yyyy/MM/dd")
     private Date ydjgsj;
+
+    // 实际开工时间
+    @JsonProperty("sjkgsj")
+    @JsonFormat(pattern = "yyyy/MM/dd")
+    private Date sjkgsj;
+    // 是否开工
+    private Boolean sfkg;
+
+    // 实际竣工时间
+    @JsonFormat(pattern = "yyyy/MM/dd")
+    private Date sjjgsj;
+    // 是否竣工
+    private Boolean sfjg;
 }

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

@@ -61,11 +61,30 @@ public class TdgyServiceImp implements TdgyService {
         UpdateWrapper<TdgySjDTO> wrapper = new UpdateWrapper<>();
         wrapper.eq("id", updateTdgyVo.getId());
         if (updateTdgyVo.getYdkgsj() != null) {
+            // 约定开工时间
             wrapper.set("ydkgsj", updateTdgyVo.getYdkgsj());
         }
         if (updateTdgyVo.getYdjgsj() != null) {
+            // 约定竣工时间
             wrapper.set("ydjgsj", updateTdgyVo.getYdjgsj());
         }
+        if(updateTdgyVo.getSfkg()){
+            // 是否开工
+            wrapper.set("sfkg", updateTdgyVo.getSfkg());
+        }
+        if(updateTdgyVo.getSjkgsj()!=null){
+            // 实际开工时间
+            wrapper.set("sjkgsj", updateTdgyVo.getSjkgsj());
+        }
+
+        if (updateTdgyVo.getSfjg()) {
+            // 是否竣工
+            wrapper.set("sfjg", updateTdgyVo.getSfjg());
+        }
+        if (updateTdgyVo.getSjjgsj() != null) {
+            // 实际竣工时间
+            wrapper.set("sjjgsj", updateTdgyVo.getSjjgsj());
+        }
         tdgyMapper.update(null, wrapper);
         return RequestResult.success();
     }

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

@@ -5,7 +5,7 @@
         SELECT id, xmmc, crmj, TO_CHAR(ydkgsj, 'yyyy/MM/dd') AS ydkgsj
         from tdgy_sj
         WHERE (sfjg!=true or sfjg is null)
-        and (NOW() > ydkgsj)
+        and (NOW() > ydkgsj) and sfkg!=true
         <if test="key != null and key != ''">
             and (xmmc like '%'||#{key}||'%' or srf like '%'||#{key}||'%')
         </if>