用地报批获取结构修改

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

@@ -1,6 +1,7 @@
 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.service.YdbpService;
 import com.siwei.common.core.domain.R;
@@ -43,14 +44,13 @@ public class YdbpController extends BaseController {
     /**
      * 获取用地报批
      *
-     * @param id 项目ID
+     * @param projectId 项目ID
      * @return 用地报批
      */
-    @GetMapping("/{id}")
-    public R<Ydbp> Get(@PathVariable String id) {
+    @GetMapping("/{projectId}")
+    public R<YdbpRes> Get(@PathVariable String projectId) {
         try {
-            Ydbp ydysyxz = ydbpService.get(id);
-            return R.ok(ydysyxz);
+            return R.ok(ydbpService.get(projectId));
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/YdbpRes.java

@@ -0,0 +1,14 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Ydbp;
+import lombok.Data;
+
+/**
+ * 用地报批 结果对象
+ */
+@Data
+public class YdbpRes extends Ydbp {
+    String projectName;// 项目名称
+    String projectCode;// 项目代码
+    Integer projectType;// 项目类型
+}

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

@@ -1,4 +1,24 @@
 package com.siwei.apply.domain.vo;
 
+import lombok.Data;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 用地报批 更新对象
+ */
+@Data
 public class YdbpUpdateVo {
+    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/mapper/YdbpMapper.java

@@ -13,24 +13,24 @@ public interface YdbpMapper {
     Boolean isExit(String projectId);
 
     /**
-     * 添加用地预审与选址信息
+     * 添加用地报批信息
      *
      * @param ydbp
      */
     void add(Ydbp ydbp);
 
     /**
-     * 获取用地预审与选址信息
+     * 获取用地报批信息
      *
-     * @param id
+     * @param projectId
      * @return
      */
-    Ydbp get(String id);
+    Ydbp get(String projectId);
 
     /**
-     * 更新用地预审与选址信息
+     * 更新用地报批信息
      *
-     * @param ydbbpUpdateVo
+     * @param ydbpUpdateVo
      */
-    void update(YdbpUpdateVo ydbbpUpdateVo);
+    void update(YdbpUpdateVo ydbpUpdateVo);
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/YdysyxzMapper.java

@@ -1,7 +1,6 @@
 package com.siwei.apply.mapper;
 
 import com.siwei.apply.domain.Ydysyxz;
-import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -33,7 +32,7 @@ public interface YdysyxzMapper {
     /**
      * 更新用地预审与选址信息
      *
-     * @param ydbpUpdateVo
+     * @param ydysyxzUpdateVo
      */
-    void update(YdysyxzUpdateVo ydbpUpdateVo);
+    void update(YdysyxzUpdateVo ydysyxzUpdateVo);
 }

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

@@ -1,6 +1,7 @@
 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;
 
 /**
@@ -23,10 +24,10 @@ public interface YdbpService {
     /**
      * 获取用地报批信息
      *
-     * @param id 用地报批ID
-     * @return 用地报批对象
+     * @param projectId 项目ID
+     * @return 用地报批结果对象
      */
-    Ydbp get(String id);
+    YdbpRes get(String projectId);
 
     /**
      * 更新用地报批信息

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

@@ -1,9 +1,13 @@
 package com.siwei.apply.service.impl;
 
+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.mapper.ProjectMapper;
 import com.siwei.apply.mapper.YdbpMapper;
 import com.siwei.apply.service.YdbpService;
+import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,6 +20,8 @@ import static com.siwei.apply.common.Common.UserId;
 public class YdbpImpl implements YdbpService {
     @Autowired
     private YdbpMapper ydbpMapper;
+    @Autowired
+    private ProjectMapper projectMapper;
 
     @Override
     public Boolean isExit(String projectId) {
@@ -31,8 +37,16 @@ public class YdbpImpl implements YdbpService {
     }
 
     @Override
-    public Ydbp get(String id) {
-        return ydbpMapper.get(id);
+    public YdbpRes get(String projectId) {
+        Ydbp ydbp = ydbpMapper.get(projectId);
+        Project project = projectMapper.get(projectId);
+
+        YdbpRes ydbpRes = new YdbpRes();
+        BeanUtils.copyProperties(ydbp, ydbpRes);
+        ydbpRes.setProjectName(project.getName());
+        ydbpRes.setProjectCode(project.getCode());
+        ydbpRes.setProjectType(project.getProjectType());
+        return ydbpRes;
     }
 
     @Override

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

@@ -37,7 +37,7 @@
     <select id="get" resultMap="YdbpResultMap">
         SELECT *
         FROM t_ydbp
-        WHERE id = #{id}
+        WHERE project_id = #{projectId}
     </select>