Ver código fonte

根据id获取

gushoubang 9 meses atrás
pai
commit
02e1ee9329
50 arquivos alterados com 481 adições e 16 exclusões
  1. 13 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/GyjsydjfwscdjController.java
  2. 13 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/GyjsydscdjController.java
  3. 13 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsgcghxkController.java
  4. 12 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsydghxkController.java
  5. 12 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TdgyController.java
  6. 13 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TdhyhsController.java
  7. 12 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TjyydhxController.java
  8. 12 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdbpController.java
  9. 12 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdysyxzController.java
  10. 11 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/GyjsydjfwscdjSinglRes.java
  11. 10 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/GyjsydscdjSinglRes.java
  12. 11 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/JsgcghxkSinglRes.java
  13. 11 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/TdhyhsSinglRes.java
  14. 0 1
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/TjyydhxRes.java
  15. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/GyjsydjfwscdjMapper.java
  16. 6 1
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/GyjsydscdjMapper.java
  17. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/JsgcghxkMapper.java
  18. 8 3
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/JsydghxkMapper.java
  19. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdgyMapper.java
  20. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdhyhsMapper.java
  21. 8 2
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TjyydhxMapper.java
  22. 13 5
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/YdbpMapper.java
  23. 8 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/YdysyxzMapper.java
  24. 6 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/GyjsydjfwscdjService.java
  25. 6 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/GyjsydscdjService.java
  26. 9 3
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/JsgcghxkService.java
  27. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/JsydghxkService.java
  28. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/TdgyService.java
  29. 6 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/TdhyhsService.java
  30. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/TjyydhxService.java
  31. 5 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/YdbpService.java
  32. 5 1
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/YdysyxzService.java
  33. 17 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/Gyjsydjfwscdjmpl.java
  34. 19 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/GyjsydscdjImpl.java
  35. 17 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsgcghxkImpl.java
  36. 15 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsydghxkImpl.java
  37. 15 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdgyImpl.java
  38. 17 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdhyhsImpl.java
  39. 15 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TjyydhxImpl.java
  40. 16 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdbpImpl.java
  41. 16 0
      siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdysyxzImpl.java
  42. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/GyjsydjfwscdjMapper.xml
  43. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/GyjsydscdjMapper.xml
  44. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/JsgcghxkMapper.xml
  45. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/JsydghxkMapper.xml
  46. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/TdgyMapper.xml
  47. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/TdhyhsMapper.xml
  48. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/TjyydhxMapper.xml
  49. 7 0
      siwei-modules/siwei-apply/src/main/resources/mapper/YdbpMapper.xml
  50. 8 0
      siwei-modules/siwei-apply/src/main/resources/mapper/YdysyxzMapper.xml

+ 13 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/GyjsydjfwscdjController.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.res.GyjsydjfwscdjRes;
+import com.siwei.apply.domain.res.GyjsydjfwscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjVo;
 import com.siwei.apply.domain.vo.OnChainVo;
@@ -58,6 +59,18 @@ public class GyjsydjfwscdjController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取单条记录,返回包含项目名称与代码的结构(与 GyjsydscdjController 风格一致)
+     */
+    @GetMapping("/id/{id}")
+    public R<GyjsydjfwscdjSinglRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(gyjsydjfwscdjService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新国有建设用地使用权及房屋所有权首次登记
      *

+ 13 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/GyjsydscdjController.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.res.GyjsydscdjRes;
+import com.siwei.apply.domain.res.GyjsydscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydscdjVo;
 import com.siwei.apply.domain.vo.OnChainVo;
@@ -58,6 +59,18 @@ public class GyjsydscdjController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取国有建设用地使用权首次登记,返回结果与按projectId查询一致
+     */
+    @GetMapping("/id/{id}")
+    public R<GyjsydscdjSinglRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(gyjsydscdjService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新国有建设用地使用权首次登记
      *

+ 13 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsgcghxkController.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.res.JsgcghxkRes;
+import com.siwei.apply.domain.res.JsgcghxkSinglRes;
 import com.siwei.apply.domain.vo.JsgcghxkUpdateVo;
 import com.siwei.apply.domain.vo.JsgcghxkVo;
 import com.siwei.apply.domain.vo.OnChainVo;
@@ -60,6 +61,18 @@ public class JsgcghxkController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取建设工程规划许可,返回结果与按projectId查询一致(单条结构)
+     */
+    @GetMapping("/id/{id}")
+    public R<JsgcghxkSinglRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(jsgcghxkService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新建设工程规划许可
      *

+ 12 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsydghxkController.java

@@ -57,6 +57,18 @@ public class JsydghxkController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取建设用地规划许可,返回结果与按projectId查询一致
+     */
+    @GetMapping("/id/{id}")
+    public R<JsydghxkRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(jsydghxkService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新建设用地规划许可
      *

+ 12 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TdgyController.java

@@ -59,6 +59,18 @@ public class TdgyController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取土地供应,返回结果与按projectId查询一致
+     */
+    @GetMapping("/id/{id}")
+    public R<TdgyRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(tdgyService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新土地供应
      *

+ 13 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TdhyhsController.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.res.TdhyhsRes;
+import com.siwei.apply.domain.res.TdhyhsSinglRes;
 import com.siwei.apply.domain.vo.OnChainVo;
 import com.siwei.apply.domain.vo.TdhyhsUpdateVo;
 import com.siwei.apply.domain.vo.TdhyhsVo;
@@ -58,6 +59,18 @@ public class TdhyhsController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取土地核验与规划核实,返回结果与按projectId查询一致(单条结构)
+     */
+    @GetMapping("/id/{id}")
+    public R<TdhyhsSinglRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(tdhyhsService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新土地核验与规划核实
      *

+ 12 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TjyydhxController.java

@@ -56,6 +56,18 @@ public class TjyydhxController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取规划条件与用地红线出具,返回结果与按projectId查询一致
+     */
+    @GetMapping("/id/{id}")
+    public R<TjyydhxRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(tjyydhxService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新规划条件与用地红线出具
      *

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

@@ -56,6 +56,18 @@ public class YdbpController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取用地报批,返回结果与按projectId查询一致
+     */
+    @GetMapping("/id/{id}")
+    public R<YdbpRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(ydbpService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新用地报批
      *

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

@@ -58,6 +58,18 @@ public class YdysyxzController extends BaseController {
         }
     }
 
+    /**
+     * 通过主键id获取用地预审与选址信息,返回结果与按projectId查询一致
+     */
+    @GetMapping("/id/{id}")
+    public R<YdysyxzRes> GetById(@PathVariable String id) {
+        try {
+            return R.ok(ydysyxzService.getById(id));
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
     /**
      * 更新用地预审与选址信息
      *

+ 11 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/GyjsydjfwscdjSinglRes.java

@@ -0,0 +1,11 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Gyjsydjfwscdj;
+import lombok.Data;
+
+@Data
+public class GyjsydjfwscdjSinglRes extends Gyjsydjfwscdj {
+    String projectName; // 项目名称
+    String projectCode; // 项目代码
+}
+

+ 10 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/GyjsydscdjSinglRes.java

@@ -0,0 +1,10 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Gyjsydscdj;
+import lombok.Data;
+
+@Data
+public class GyjsydscdjSinglRes extends Gyjsydscdj {
+    String projectName;// 项目名称
+    String projectCode;// 项目代码
+}

+ 11 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/JsgcghxkSinglRes.java

@@ -0,0 +1,11 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Jsgcghxk;
+import lombok.Data;
+
+@Data
+public class JsgcghxkSinglRes extends Jsgcghxk {
+    String projectName; // 项目名称
+    String projectCode; // 项目代码
+}
+

+ 11 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/TdhyhsSinglRes.java

@@ -0,0 +1,11 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Tdhyhs;
+import lombok.Data;
+
+@Data
+public class TdhyhsSinglRes extends Tdhyhs {
+    String projectName; // 项目名称
+    String projectCode; // 项目代码
+}
+

+ 0 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/res/TjyydhxRes.java

@@ -10,5 +10,4 @@ import lombok.Data;
 public class TjyydhxRes extends Tjyydhx {
     String projectName;// 项目名称
     String projectCode;// 项目代码
-    private Boolean hasOnchain;    // 是否上链
 }

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/GyjsydjfwscdjMapper.java

@@ -26,6 +26,11 @@ public interface GyjsydjfwscdjMapper {
      */
     List<Gyjsydjfwscdj> get(String projectId);
 
+    /**
+     * 根据主键ID获取单条记录
+     */
+    Gyjsydjfwscdj getById(@Param("id") String id);
+
     /**
      * 更新国有建设用地使用权及房屋所有权首次登记信息
      *

+ 6 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/GyjsydscdjMapper.java

@@ -22,10 +22,15 @@ public interface GyjsydscdjMapper {
     void add(Gyjsydscdj gyjsydscdj);
 
     /**
-     * 获取国有建设用地使用权首次登记信息列表
+     * 获取国有建设用地使用权首次登记信息列表(按项目ID)
      */
     List<Gyjsydscdj> get(String projectId);
 
+    /**
+     * 获取国有建设用地使用权首次登记信息(按主键ID)
+     */
+    Gyjsydscdj getById(@Param("id") String id);
+
     /**
      * 更新国有建设用地使用权首次登记信息
      *

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/JsgcghxkMapper.java

@@ -30,6 +30,11 @@ public interface JsgcghxkMapper {
      */
     List<Jsgcghxk> get(String projectId);
 
+    /**
+     * 根据主键ID获取建设工程规划许可记录
+     */
+    Jsgcghxk getById(@Param("id") String id);
+
     /**
      * 更新建设工程规划许可信息
      *

+ 8 - 3
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/JsydghxkMapper.java

@@ -21,13 +21,18 @@ public interface JsydghxkMapper {
     void add(Jsydghxk jsydghxk);
 
     /**
-     * 获取建设用地规划许可信息
+     * 获取建设用地规划许可信息(按项目ID)
      *
-     * @param projectId
-     * @return
+     * @param projectId 项目ID
+     * @return 记录
      */
     Jsydghxk get(String projectId);
 
+    /**
+     * 获取建设用地规划许可信息(按主键ID)
+     */
+    Jsydghxk getById(@Param("id") String id);
+
     /**
      * 更新建设用地规划许可信息
      *

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdgyMapper.java

@@ -31,6 +31,11 @@ public interface TdgyMapper {
      */
     Tdgy get(String projectId);
 
+    /**
+     * 获取土地供应信息(按主键ID)
+     */
+    Tdgy getById(@Param("id") String id);
+
     /**
      * 更新土地供应信息
      *

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TdhyhsMapper.java

@@ -29,6 +29,11 @@ public interface TdhyhsMapper {
      */
     List<Tdhyhs> get(String projectId);
 
+    /**
+     * 根据主键ID获取单条记录
+     */
+    Tdhyhs getById(@Param("id") String id);
+
     /**
      * 更新土地核验与规划核实信息
      *

+ 8 - 2
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/TjyydhxMapper.java

@@ -3,6 +3,7 @@ package com.siwei.apply.mapper;
 import com.siwei.apply.domain.Tjyydhx;
 import com.siwei.apply.domain.vo.TjyydhxUpdateVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 // 规划条件与用地红线出具 Mapper 接口
 @Mapper
@@ -20,13 +21,18 @@ public interface TjyydhxMapper {
     void add(Tjyydhx tjyydhx);
 
     /**
-     * 获取规划条件与用地红线出具信息
+     * 获取规划条件与用地红线出具信息(按项目ID)
      *
      * @param projectId
      * @return
      */
     Tjyydhx get(String projectId);
 
+    /**
+     * 获取规划条件与用地红线出具信息(按主键ID)
+     */
+    Tjyydhx getById(@Param("id") String id);
+
     /**
      * 更新规划条件与用地红线出具信息
      *
@@ -39,5 +45,5 @@ public interface TjyydhxMapper {
      * @param id 主键ID
      * @param hasOnchain 上链状态
      */
-    void updateHasOnchain(String id, Boolean hasOnchain);
+    void updateHasOnchain(@Param("id") String id, @Param("hasOnchain") Boolean hasOnchain);
 }

+ 13 - 5
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/YdbpMapper.java

@@ -16,22 +16,30 @@ public interface YdbpMapper {
     /**
      * 添加用地报批信息
      *
-     * @param ydbp
+     * @param ydbp 用地报批实体
      */
     void add(Ydbp ydbp);
 
     /**
-     * 获取用地报批信息
+     * 获取用地报批信息(按项目ID)
      *
-     * @param projectId
-     * @return
+     * @param projectId 项目ID
+     * @return 用地报批记录
      */
     Ydbp get(String projectId);
 
+    /**
+     * 获取用地报批信息(按主键ID)
+     *
+     * @param id 主键ID
+     * @return 用地报批记录
+     */
+    Ydbp getById(@Param("id") String id);
+
     /**
      * 更新用地报批信息
      *
-     * @param ydbpUpdateVo
+     * @param ydbpUpdateVo 更新视图对象
      */
     void update(YdbpUpdateVo ydbpUpdateVo);
 

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

@@ -30,6 +30,14 @@ public interface YdysyxzMapper {
      */
     Ydysyxz get(String projectId);
 
+    /**
+     * 根据主键id获取用地预审与选址信息
+     *
+     * @param id 主键id
+     * @return 记录
+     */
+    Ydysyxz getById(String id);
+
     /**
      * 更新用地预审与选址信息
      *

+ 6 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/GyjsydjfwscdjService.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.service;
 
 import com.siwei.apply.domain.res.GyjsydjfwscdjRes;
+import com.siwei.apply.domain.res.GyjsydjfwscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjVo;
 
@@ -26,6 +27,11 @@ public interface GyjsydjfwscdjService {
      */
     GyjsydjfwscdjRes get(String projectId);
 
+    /**
+     * 根据主键id获取单条记录,返回包含项目名称与代码的结构
+     */
+    GyjsydjfwscdjSinglRes getById(String id);
+
     /**
      * 更新国有建设用地使用权及房屋所有权首次登记信息
      *

+ 6 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/GyjsydscdjService.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.service;
 
 import com.siwei.apply.domain.res.GyjsydscdjRes;
+import com.siwei.apply.domain.res.GyjsydscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydscdjVo;
 
@@ -29,6 +30,11 @@ public interface GyjsydscdjService {
      */
     GyjsydscdjRes get(String projectId);
 
+    /**
+     * 根据主键id获取国有建设用地使用权首次登记信息,返回结构与 get(projectId) 一致
+     */
+    GyjsydscdjSinglRes getById(String id);
+
     /**
      * 更新国有建设用地使用权首次登记信息
      *

+ 9 - 3
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/JsgcghxkService.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.service;
 
 import com.siwei.apply.domain.res.JsgcghxkRes;
+import com.siwei.apply.domain.res.JsgcghxkSinglRes;
 import com.siwei.apply.domain.vo.JsgcghxkUpdateVo;
 import com.siwei.apply.domain.vo.JsgcghxkVo;
 
@@ -22,13 +23,18 @@ public interface JsgcghxkService {
     String add(JsgcghxkVo jsgcghxkVo);
 
     /**
-     * 获取建设工程规划许可信息
+     * 获取建设工程规划许可信息(按项目ID)
      *
      * @param projectId 项目ID
-     * @return 建设工程规划许可结果对象
+     * @return 建设工程规划许可结果对象(列表)
      */
     JsgcghxkRes get(String projectId);
 
+    /**
+     * 根据主键id获取建设工程规划许可,返回单条结构,含项目名称与代码
+     */
+    JsgcghxkSinglRes getById(String id);
+
     /**
      * 更新建设工程规划许可信息
      *
@@ -37,7 +43,7 @@ public interface JsgcghxkService {
     void update(JsgcghxkUpdateVo jsgcghxkUpdateVo);
 
     /**
-     * 更新建设工程规划��可的上链状态
+     * 更新建设工程规划可的上链状态
      * @param id 主键ID
      * @param hasOnchain 是否上链
      */

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/JsydghxkService.java

@@ -29,6 +29,11 @@ public interface JsydghxkService {
      */
     JsydghxkRes get(String projectId);
 
+    /**
+     * 根据主键id获取建设用地规划许可信息,返回结构与 get(projectId) 一致
+     */
+    JsydghxkRes getById(String id);
+
     /**
      * 更新建设用地规划许可信息
      *

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/TdgyService.java

@@ -32,6 +32,11 @@ public interface TdgyService {
      */
     TdgyRes get(String projectId);
 
+    /**
+     * 根据主键id获取土地供应信息,返回结构与 get(projectId) 一致
+     */
+    TdgyRes getById(String id);
+
     /**
      * 更新土地供应信息
      *

+ 6 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/TdhyhsService.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.service;
 
 import com.siwei.apply.domain.res.TdhyhsRes;
+import com.siwei.apply.domain.res.TdhyhsSinglRes;
 import com.siwei.apply.domain.vo.TdhyhsUpdateVo;
 import com.siwei.apply.domain.vo.TdhyhsVo;
 
@@ -29,6 +30,11 @@ public interface TdhyhsService {
      */
     TdhyhsRes get(String projectId);
 
+    /**
+     * 根据主键id获取土地核验与规划核实(单条),返回包含项目名称/代码的结构
+     */
+    TdhyhsSinglRes getById(String id);
+
     /**
      * 更新土地核验与规划核实信息
      *

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/TjyydhxService.java

@@ -29,6 +29,11 @@ public interface TjyydhxService {
      */
     TjyydhxRes get(String projectId);
 
+    /**
+     * 根据主键id获取规划条件与用地红线出具信息,返回结构与 get(projectId) 一致
+     */
+    TjyydhxRes getById(String id);
+
     /**
      * 更新规划条件与用地红线出具信息
      *

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

@@ -29,6 +29,11 @@ public interface YdbpService {
      */
     YdbpRes get(String projectId);
 
+    /**
+     * 根据主键id获取用地报批信息,返回结构与 get(projectId) 一致
+     */
+    YdbpRes getById(String id);
+
     /**
      * 更新用地报批信息
      *

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

@@ -1,6 +1,5 @@
 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;
@@ -27,6 +26,11 @@ public interface YdysyxzService {
      */
     YdysyxzRes get(String projectId);
 
+    /**
+     * 根据主键id获取用地预审与选址信息,返回结果结构与 get(projectId) 一致
+     */
+    YdysyxzRes getById(String id);
+
     /**
      * 更新用地预审与选址信息
      *

+ 17 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/Gyjsydjfwscdjmpl.java

@@ -3,6 +3,7 @@ package com.siwei.apply.service.impl;
 import com.siwei.apply.domain.Gyjsydjfwscdj;
 import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.res.GyjsydjfwscdjRes;
+import com.siwei.apply.domain.res.GyjsydjfwscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydjfwscdjVo;
 import com.siwei.apply.mapper.GyjsydjfwscdjMapper;
@@ -88,6 +89,22 @@ public class Gyjsydjfwscdjmpl implements GyjsydjfwscdjService {
         return res;
     }
 
+    @Override
+    public GyjsydjfwscdjSinglRes getById(String id) {
+        Gyjsydjfwscdj item = gyjsydjfwscdjMapper.getById(id);
+        if (item == null) {
+            return null;
+        }
+        Project project = projectMapper.get(item.getProjectId());
+        GyjsydjfwscdjSinglRes res = new GyjsydjfwscdjSinglRes();
+        BeanUtils.copyProperties(item, res);
+        if (project != null) {
+            res.setProjectName(project.getName());
+            res.setProjectCode(project.getCode());
+        }
+        return res;
+    }
+
     @Override
     public void update(GyjsydjfwscdjUpdateVo gyjsydjfwscdjUpdateVo) {
         gyjsydjfwscdjMapper.update(gyjsydjfwscdjUpdateVo);

+ 19 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/GyjsydscdjImpl.java

@@ -3,6 +3,7 @@ package com.siwei.apply.service.impl;
 import com.siwei.apply.domain.Gyjsydscdj;
 import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.res.GyjsydscdjRes;
+import com.siwei.apply.domain.res.GyjsydscdjSinglRes;
 import com.siwei.apply.domain.vo.GyjsydscdjUpdateVo;
 import com.siwei.apply.domain.vo.GyjsydscdjVo;
 import com.siwei.apply.mapper.GyjsydscdjMapper;
@@ -22,6 +23,7 @@ import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.mapper.WorkflowMapper;
 
 import java.util.List;
+import java.util.Collections;
 
 /**
  * 国有建设用地使用权首次登记 服务实现类
@@ -89,6 +91,23 @@ public class GyjsydscdjImpl implements GyjsydscdjService {
         return res;
     }
 
+    @Override
+    public GyjsydscdjSinglRes getById(String id) {
+        GyjsydscdjSinglRes res = new GyjsydscdjSinglRes();
+        Gyjsydscdj item = gyjsydscdjMapper.getById(id);
+        if (item == null) {
+            return null;
+        }
+        Project project = projectMapper.get(item.getProjectId());
+        res.setProjectId(item.getProjectId());
+        if (project != null) {
+            res.setProjectName(project.getName());
+            res.setProjectCode(project.getCode());
+        }
+        BeanUtils.copyProperties(res, item);
+        return res;
+    }
+
     @Override
     public void update(GyjsydscdjUpdateVo gyjsydscdjUpdateVo) {
         gyjsydscdjMapper.update(gyjsydscdjUpdateVo);

+ 17 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsgcghxkImpl.java

@@ -3,6 +3,7 @@ package com.siwei.apply.service.impl;
 import com.siwei.apply.domain.Jsgcghxk;
 import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.res.JsgcghxkRes;
+import com.siwei.apply.domain.res.JsgcghxkSinglRes;
 import com.siwei.apply.domain.vo.JsgcghxkUpdateVo;
 import com.siwei.apply.domain.vo.JsgcghxkVo;
 import com.siwei.apply.mapper.JsgcghxkMapper;
@@ -88,6 +89,22 @@ public class JsgcghxkImpl implements JsgcghxkService {
         return jsgcghxkRes;
     }
 
+    @Override
+    public JsgcghxkSinglRes getById(String id) {
+        Jsgcghxk record = jsgcghxkMapper.getById(id);
+        if (record == null) {
+            return null;
+        }
+        Project project = projectMapper.get(record.getProjectId());
+        JsgcghxkSinglRes res = new JsgcghxkSinglRes();
+        BeanUtils.copyProperties(record, res);
+        if (project != null) {
+            res.setProjectName(project.getName());
+            res.setProjectCode(project.getCode());
+        }
+        return res;
+    }
+
     @Override
     public void update(JsgcghxkUpdateVo jsgcghxkUpdateVo) {
         jsgcghxkMapper.update(jsgcghxkUpdateVo);

+ 15 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsydghxkImpl.java

@@ -86,6 +86,21 @@ public class JsydghxkImpl implements JsydghxkService {
         return jsydghxkRes;
     }
 
+    @Override
+    public JsydghxkRes getById(String id) {
+        Jsydghxk record = jsydghxkMapper.getById(id);
+        if (record == null) {
+            return null;
+        }
+        Project project = projectMapper.get(record.getProjectId());
+        JsydghxkRes res = new JsydghxkRes();
+        BeanUtils.copyProperties(record, res);
+        res.setProjectId(record.getProjectId());
+        res.setProjectName(project.getName());
+        res.setProjectCode(project.getCode());
+        return res;
+    }
+
     @Override
     public void update(JsydghxkUpdateVo jsydghxkUpdateVo) {
         jsydghxkMapper.update(jsydghxkUpdateVo);

+ 15 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdgyImpl.java

@@ -95,6 +95,21 @@ public class TdgyImpl implements TdgyService {
         return tdgyRes;
     }
 
+    @Override
+    public TdgyRes getById(String id) {
+        Tdgy tdgy = tdgyMapper.getById(id);
+        if (tdgy == null) {
+            return null;
+        }
+        Project project = projectMapper.get(tdgy.getProjectId());
+        TdgyRes tdgyRes = new TdgyRes();
+        BeanUtils.copyProperties(tdgy, tdgyRes);
+        tdgyRes.setProjectId(tdgy.getProjectId());
+        tdgyRes.setProjectName(project.getName());
+        tdgyRes.setProjectCode(project.getCode());
+        return tdgyRes;
+    }
+
     @Override
     public void update(TdgyUpdateVo tdgyUpdateVo) {
         tdgyMapper.update(tdgyUpdateVo);

+ 17 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdhyhsImpl.java

@@ -3,6 +3,7 @@ package com.siwei.apply.service.impl;
 import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.Tdhyhs;
 import com.siwei.apply.domain.res.TdhyhsRes;
+import com.siwei.apply.domain.res.TdhyhsSinglRes;
 import com.siwei.apply.domain.vo.TdhyhsUpdateVo;
 import com.siwei.apply.domain.vo.TdhyhsVo;
 import com.siwei.apply.mapper.ProjectMapper;
@@ -89,6 +90,22 @@ public class TdhyhsImpl implements TdhyhsService {
         return res;
     }
 
+    @Override
+    public TdhyhsSinglRes getById(String id) {
+        Tdhyhs item = tdhyhsMapper.getById(id);
+        if (item == null) {
+            return null;
+        }
+        Project project = projectMapper.get(item.getProjectId());
+        TdhyhsSinglRes res = new TdhyhsSinglRes();
+        BeanUtils.copyProperties(item, res);
+        if (project != null) {
+            res.setProjectName(project.getName());
+            res.setProjectCode(project.getCode());
+        }
+        return res;
+    }
+
     @Override
     public void update(TdhyhsUpdateVo tdhyhsUpdateVo) {
         tdhyhsMapper.update(tdhyhsUpdateVo);

+ 15 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TjyydhxImpl.java

@@ -76,6 +76,21 @@ public class TjyydhxImpl implements TjyydhxService {
         return tjyydhxRes;
     }
 
+    @Override
+    public TjyydhxRes getById(String id) {
+        Tjyydhx record = tjyydhxMapper.getById(id);
+        if (record == null) {
+            return null;
+        }
+        Project project = projectMapper.get(record.getProjectId());
+        TjyydhxRes res = new TjyydhxRes();
+        BeanUtils.copyProperties(record, res);
+        res.setProjectId(record.getProjectId());
+        res.setProjectName(project.getName());
+        res.setProjectCode(project.getCode());
+        return res;
+    }
+
     @Override
     public void update(TjyydhxUpdateVo tjyydhxUpdateVo) {
         tjyydhxMapper.update(tjyydhxUpdateVo);

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

@@ -93,6 +93,22 @@ public class YdbpImpl implements YdbpService {
         return ydbpRes;
     }
 
+    @Override
+    public YdbpRes getById(String id) {
+        Ydbp ydbp = ydbpMapper.getById(id);
+        if (ydbp == null) {
+            return null;
+        }
+        Project project = projectMapper.get(ydbp.getProjectId());
+        YdbpRes ydbpRes = new YdbpRes();
+        BeanUtils.copyProperties(ydbp, ydbpRes);
+        ydbpRes.setProjectId(ydbp.getProjectId());
+        ydbpRes.setProjectName(project.getName());
+        ydbpRes.setProjectCode(project.getCode());
+        ydbpRes.setProjectType(project.getProjectType());
+        return ydbpRes;
+    }
+
     @Override
     public void update(YdbpUpdateVo ydbpUpdateVo) {
         ydbpMapper.update(ydbpUpdateVo);

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

@@ -78,6 +78,22 @@ public class YdysyxzImpl implements YdysyxzService {
         return ydysyxzRes;
     }
 
+    @Override
+    public YdysyxzRes getById(String id) {
+        Ydysyxz ydysyxz = ydysyxzMapper.getById(id);
+        if (ydysyxz == null) {
+            return null;
+        }
+        Project project = projectMapper.get(ydysyxz.getProjectId());
+        YdysyxzRes ydysyxzRes = new YdysyxzRes();
+        BeanUtils.copyProperties(ydysyxz, ydysyxzRes);
+        ydysyxzRes.setProjectId(ydysyxz.getProjectId());
+        ydysyxzRes.setProjectName(project.getName());
+        ydysyxzRes.setProjectCode(project.getCode());
+        ydysyxzRes.setProjectCompany(project.getCompany());
+        return ydysyxzRes;
+    }
+
     @Override
     public void update(YdysyxzUpdateVo ydysyxzUpdateVo) {
         ydysyxzMapper.update(ydysyxzUpdateVo);

+ 7 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/GyjsydjfwscdjMapper.xml

@@ -53,6 +53,13 @@
         ORDER BY created_at ASC
     </select>
 
+    <!-- 新增:根据主键ID获取单条记录 -->
+    <select id="getById" resultMap="BaseResultMap" parameterType="String">
+        SELECT *
+        FROM t_gyjsydjfwscdj
+        WHERE id = #{id}
+    </select>
+
     <!-- 更新记录 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.GyjsydjfwscdjUpdateVo">
         UPDATE t_gyjsydjfwscdj

+ 7 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/GyjsydscdjMapper.xml

@@ -46,6 +46,13 @@
         ORDER BY created_at ASC
     </select>
 
+    <!-- 新增:根据主键ID获取记录 -->
+    <select id="getById" resultMap="GyjsydscdjResultMap" parameterType="String">
+        SELECT *
+        FROM t_gyjsydscdj
+        WHERE id = #{id}
+    </select>
+
     <!-- 更新记录 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.GyjsydscdjUpdateVo">
         UPDATE t_gyjsydscdj

+ 7 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/JsgcghxkMapper.xml

@@ -46,6 +46,13 @@
         ORDER BY created_at ASC
     </select>
 
+    <!-- 新增:根据主键ID获取记录 -->
+    <select id="getById" resultMap="JsgcghxkResultMap" parameterType="String">
+        SELECT *
+        FROM t_jsgcghxk
+        WHERE id = #{id}
+    </select>
+
     <!-- 更新记录 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.JsgcghxkUpdateVo">
         UPDATE t_jsgcghxk

+ 7 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/JsydghxkMapper.xml

@@ -48,6 +48,13 @@
         WHERE project_id = #{projectId}
     </select>
 
+    <!-- 新增:根据主键ID获取记录 -->
+    <select id="getById" resultMap="BaseResultMap" parameterType="String">
+        SELECT *
+        FROM t_jsydghxk
+        WHERE id = #{id}
+    </select>
+
     <!-- 更新记录 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.JsydghxkUpdateVo">
         UPDATE t_jsydghxk

+ 7 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/TdgyMapper.xml

@@ -49,6 +49,13 @@
         WHERE project_id = #{projectId}
     </select>
 
+    <!-- 新增:根据主键ID获取记录 -->
+    <select id="getById" resultMap="BaseResultMap" parameterType="String">
+        SELECT *
+        FROM t_tdgy
+        WHERE id = #{id}
+    </select>
+
     <!-- 更新记录 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.TdgyUpdateVo">
         UPDATE t_tdgy

+ 7 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/TdhyhsMapper.xml

@@ -46,6 +46,13 @@
         ORDER BY created_at ASC
     </select>
 
+    <!-- 新增:根据主键ID获取单条记录 -->
+    <select id="getById" resultMap="BaseResultMap" parameterType="String">
+        SELECT *
+        FROM t_tdhyhs
+        WHERE id = #{id}
+    </select>
+
     <!-- 更新记录 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.TdhyhsUpdateVo">
         UPDATE t_tdhyhs

+ 7 - 0
siwei-modules/siwei-apply/src/main/resources/mapper/TjyydhxMapper.xml

@@ -44,6 +44,13 @@
         WHERE project_id = #{projectId}
     </select>
 
+    <!-- 新增:根据主键ID获取记录 -->
+    <select id="getById" resultMap="TjyydhxResultMap" parameterType="String">
+        SELECT *
+        FROM t_tjyydhx
+        WHERE id = #{id}
+    </select>
+
     <!-- 更新记录 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.TjyydhxUpdateVo">
         UPDATE t_tjyydhx

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

@@ -41,6 +41,13 @@
         WHERE project_id = #{projectId}
     </select>
 
+    <!-- 新增:根据主键id获取记录 -->
+    <select id="getById" resultMap="YdbpResultMap">
+        SELECT *
+        FROM t_ydbp
+        WHERE id = #{id}
+    </select>
+
 
     <!-- 更新语句 -->
     <update id="update" parameterType="com.siwei.apply.domain.vo.YdbpUpdateVo">

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

@@ -38,6 +38,14 @@
         FROM t_ydysyxz
         WHERE project_id = #{projectId}
     </select>
+
+    <!-- 新增:根据主键id获取记录 -->
+    <select id="getById" resultMap="resMap">
+        SELECT *
+        FROM t_ydysyxz
+        WHERE id = #{id}
+    </select>
+
     <update id="update" parameterType="com.siwei.apply.domain.vo.YdysyxzUpdateVo">
         UPDATE t_ydysyxz
         <set>