用地预审与选址获取接口修改

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

@@ -2,7 +2,6 @@ package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.Ydbp;
 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;

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.res.YdysyxzRes;
 import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzVo;
 import com.siwei.apply.service.YdysyxzService;
@@ -45,15 +46,13 @@ public class YdysyxzController extends BaseController {
     /**
      * 获取用地预审与选址信息
      *
-     * @param id 项目ID
+     * @param projectId 项目ID
      * @return 用地预审与选址信息
      */
-    @GetMapping("/{id}")
-    public R<Map> Get(@PathVariable String id) {
+    @GetMapping("/{projectId}")
+    public R<YdysyxzRes> Get(@PathVariable String projectId) {
         try {
-            Map<String, Object> map = new HashMap<>();
-            map.put("ydysyxz", ydysyxzService.get(id));
-            return R.ok(map);
+            return R.ok(ydysyxzService.get(projectId));
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }

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

@@ -0,0 +1,14 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Ydysyxz;
+import lombok.Data;
+
+/**
+ * 用地预审与选址 结果对象
+ */
+@Data
+public class YdysyxzRes extends Ydysyxz {
+    String projectName;// 项目名称
+    String projectCode;// 项目代码
+    String projectCompany;// 项目建设单位
+}

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

@@ -1,4 +0,0 @@
-package com.siwei.apply.domain.vo;
-
-public class YdbpVo {
-}

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

@@ -25,10 +25,10 @@ public interface YdysyxzMapper {
     /**
      * 获取用地预审与选址信息
      *
-     * @param id
+     * @param projectId
      * @return
      */
-    Ydysyxz get(String id);
+    Ydysyxz get(String projectId);
 
     /**
      * 更新用地预审与选址信息

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

@@ -2,7 +2,6 @@ package com.siwei.apply.service;
 
 import com.siwei.apply.domain.Ydbp;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
-import com.siwei.apply.domain.vo.YdbpVo;
 
 /**
  * 用地报批 服务接口

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

@@ -1,6 +1,7 @@
 package com.siwei.apply.service;
 
 import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.res.YdysyxzRes;
 import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzVo;
 
@@ -21,10 +22,10 @@ public interface YdysyxzService {
     /**
      * 获取用地预审与选址信息
      *
-     * @param id 项目ID
+     * @param projectId 项目ID
      * @return 用地预审与选址信息
      */
-    Ydysyxz get(String id);
+    YdysyxzRes get(String projectId);
 
     /**
      * 更新用地预审与选址信息

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

@@ -2,10 +2,8 @@ package com.siwei.apply.service.impl;
 
 import com.siwei.apply.domain.Ydbp;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
-import com.siwei.apply.domain.vo.YdbpVo;
 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;
 

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

@@ -1,8 +1,11 @@
 package com.siwei.apply.service.impl;
 
+import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.res.YdysyxzRes;
 import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzVo;
+import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.YdysyxzMapper;
 import com.siwei.apply.service.YdysyxzService;
 import com.siwei.common.core.utils.bean.BeanUtils;
@@ -18,6 +21,8 @@ import static com.siwei.apply.common.Common.UserId;
 public class YdysyxzImpl implements YdysyxzService {
     @Autowired
     private YdysyxzMapper ydysyxzMapper;
+    @Autowired
+    private ProjectMapper projectMapper;
 
     @Override
     public Boolean isExit(String projectId) {
@@ -35,8 +40,16 @@ public class YdysyxzImpl implements YdysyxzService {
     }
 
     @Override
-    public Ydysyxz get(String id) {
-        return ydysyxzMapper.get(id);
+    public YdysyxzRes get(String projectId) {
+        Ydysyxz ydysyxz = ydysyxzMapper.get(projectId);
+        Project project = projectMapper.get(projectId);
+
+        YdysyxzRes ydysyxzRes = new YdysyxzRes();
+        BeanUtils.copyProperties(ydysyxz, ydysyxzRes);
+        ydysyxzRes.setProjectName(project.getName());
+        ydysyxzRes.setProjectCode(project.getCode());
+        ydysyxzRes.setProjectCompany(project.getCompany());
+        return ydysyxzRes;
     }
 
     @Override

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

@@ -35,7 +35,7 @@
     <select id="get" resultMap="resMap">
         SELECT *
         FROM t_ydysyxz
-        WHERE project_id = #{id}
+        WHERE project_id = #{projectId}
     </select>
     <update id="update" parameterType="com.siwei.apply.domain.vo.YdysyxzUpdateVo">
         UPDATE t_ydysyxz