添加用地预审与选址信息

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/ProjectController.java

@@ -92,13 +92,13 @@ public class ProjectController extends BaseController {
     /**
      * 删除项目
      *
-     * @param projectId
+     * @param id
      * @return
      */
-    @DeleteMapping("/{projectId}")
-    public R<Map> DeleteProject(@PathVariable String projectId) {
+    @DeleteMapping("/{id}")
+    public R<Map> DeleteProject(@PathVariable String id) {
         try {
-            projectService.deleteProject(projectId);
+            projectService.deleteProject(id);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdysyxzController.java

@@ -1,5 +1,6 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzVo;
 import com.siwei.apply.service.YdysyxzService;
 import com.siwei.common.core.domain.R;
@@ -48,4 +49,19 @@ public class YdysyxzController extends BaseController {
             return R.fail(e.getMessage());
         }
     }
+    /**
+     * 更新用地预审与选址信息
+     *
+     * @param ydysyxzUpdateVo 用地预审与选址视图对象
+     * @return 操作结果
+     */
+    @PutMapping()
+    public R<Void> UpdateYdysyxz(@RequestBody YdysyxzUpdateVo ydysyxzUpdateVo) {
+        try {
+            ydysyxzService.updateYdysyxz(ydysyxzUpdateVo);
+            return R.ok();
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Ydysyxz.java

@@ -26,9 +26,9 @@ public class Ydysyxz {
     private Boolean hasOnchain;//是否上链
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createAt;
+    private Date createdAt;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateAt;
+    private Date updatedAt;
     private String creatorId;
 
     public void generateId() {

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/YdysyxzVo.java

@@ -1,8 +1,11 @@
 package com.siwei.apply.domain.vo;
 
+import lombok.Data;
+
 /**
  * 用地预审与选址 视图对象
  */
+@Data
 public class YdysyxzVo {
     private String projectId;
     private String jsyj;//建设依据

siwei-modules/siwei-apply/src/main/resources/mapper/YdysyxzMapper.xml

@@ -13,15 +13,15 @@
         <result property="xmjsyj" column="xmjsyj"/>
         <result property="zzwh" column="zzwh"/>
         <result property="fzDate" column="fz_date"/>
-        <result property="attachment" column="attachment" typeHandler="com.siwei.apply.handler.JsonbTypeHandler" />
+        <result property="attachment" column="attachment" typeHandler="com.siwei.apply.handler.JsonbTypeHandler"/>
         <result property="hasOnchain" column="has_onchain"/>
-        <result property="createAt" column="create_at"/>
-        <result property="updateAt" column="update_at"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
         <result property="creatorId" column="creator_id"/>
     </resultMap>
     <insert id="addYdysyxz" parameterType="com.siwei.apply.domain.Ydysyxz">
         INSERT INTO t_ydysyxz (id, project_id, jsyj, jsdd, area, has_zz,
-                               xmjsyj, zzwh, fz_date, has_onchain,create_at, update_at, creator_id)
+                               xmjsyj, zzwh, fz_date, has_onchain, created_at, updated_at, creator_id)
         VALUES (#{id}, #{projectId}, #{jsyj}, #{jsdd}, #{area}, #{hasZz},
                 #{xmjsyj}, #{zzwh}, #{fzDate},
                 #{hasOnchain}, now(), now(), #{creatorId})