更新修改结构

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

@@ -1,8 +1,8 @@
 package com.siwei.apply.controller;
 
-import com.siwei.apply.domain.Ydbp;
 import com.siwei.apply.domain.res.YdbpRes;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
+import com.siwei.apply.domain.vo.YdbpVo;
 import com.siwei.apply.service.YdbpService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -26,13 +26,13 @@ public class YdbpController extends BaseController {
      * 添加用地报批
      */
     @PostMapping()
-    public R<Map> Add(@RequestBody Ydbp ydbp) {
+    public R<Map> Add(@RequestBody YdbpVo ydbpVo) {
         try {
-            Boolean b = ydbpService.isExit(ydbp.getProjectId());
+            Boolean b = ydbpService.isExit(ydbpVo.getProjectId());
             if (b == true) {
                 return R.fail("此项目已添加用地报批");
             }
-            String id = ydbpService.add(ydbp);
+            String id = ydbpService.add(ydbpVo);
             Map<String, String> map = new HashMap<>();
             map.put("id", id);
             return R.ok(map);

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

@@ -2,23 +2,11 @@ package com.siwei.apply.domain.vo;
 
 import lombok.Data;
 
-import java.util.Date;
-import java.util.Map;
-
 /**
  * 用地报批 更新对象
  */
 @Data
-public class YdbpUpdateVo {
+public class YdbpUpdateVo extends YdbpVo {
     private String id;
-    private String projectId;
-    private String tdyt;//土地用途
-    private Float ydArea;//用地面积
-    private Float zsArea;//征收面积
-    private Boolean hasZZ;//是否完成征转
-    private Date bpDate;//报批日期
-    private String pfwh;//批复文号
-    private Date pfDate;//批复日期
-    private Map<String, Object> attachment; // 存储附件的目录树
     private Boolean hasOnchain;//是否上链
 }

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

@@ -0,0 +1,20 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用地报批 视图对象
+ */
+@Data
+public class YdbpVo {
+    private String projectId;// 项目ID
+    private String tdyt;// 土地用途
+    private Float ydArea;// 用地面积
+    private Float zsArea;// 征收面积
+    private Boolean hasZZ;// 是否完成征转
+    private Date bpDate;// 报批日期
+    private String pfwh;// 批复文号
+    private Date pfDate;// 批复日期
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/YdbpService.java

@@ -1,8 +1,8 @@
 package com.siwei.apply.service;
 
-import com.siwei.apply.domain.Ydbp;
 import com.siwei.apply.domain.res.YdbpRes;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
+import com.siwei.apply.domain.vo.YdbpVo;
 
 /**
  * 用地报批 服务接口
@@ -16,10 +16,10 @@ public interface YdbpService {
     /**
      * 添加用地报批信息
      *
-     * @param ydbp 用地报批视图对象
+     * @param ydbpVo 用地报批视图对象
      * @return 用地报批ID
      */
-    String add(Ydbp ydbp);
+    String add(YdbpVo ydbpVo);
 
     /**
      * 获取用地报批信息

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdbpImpl.java

@@ -4,6 +4,7 @@ import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.Ydbp;
 import com.siwei.apply.domain.res.YdbpRes;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
+import com.siwei.apply.domain.vo.YdbpVo;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.YdbpMapper;
 import com.siwei.apply.service.YdbpService;
@@ -29,7 +30,9 @@ public class YdbpImpl implements YdbpService {
     }
 
     @Override
-    public String add(Ydbp ydbp) {
+    public String add(YdbpVo ydbpVo) {
+        Ydbp ydbp = new Ydbp();
+        BeanUtils.copyProperties(ydbpVo, ydbp);
         ydbp.generateId();
         ydbp.setCreatorId(UserId);
         ydbpMapper.add(ydbp);

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

@@ -42,7 +42,7 @@
 
 
     <!-- 更新语句 -->
-    <update id="update" parameterType="com.siwei.apply.domain.Ydbp">
+    <update id="update" parameterType="com.siwei.apply.domain.vo.YdbpUpdateVo">
         UPDATE t_ydbp
         <set>
             <if test="projectId != null">project_id = #{projectId},</if>
@@ -53,7 +53,6 @@
             <if test="bpDate != null">bp_date = #{bpDate},</if>
             <if test="pfwh != null">pfwh = #{pfwh},</if>
             <if test="pfDate != null">pf_date = #{pfDate},</if>
-            <if test="attachment != null">attachment = #{attachment, jdbcType=OTHER},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>