建设用地规划许可相关代码更新

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

@@ -1,8 +1,11 @@
 package com.siwei.apply.controller;
 
-import com.siwei.apply.domain.Jsydghxk;
+import com.siwei.apply.domain.res.JsydghxkRes;
+import com.siwei.apply.domain.vo.JsydghxkUpdateVo;
+import com.siwei.apply.domain.vo.JsydghxkVo;
 import com.siwei.apply.service.JsydghxkService;
 import com.siwei.common.core.domain.R;
+import com.siwei.common.core.web.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,14 +19,21 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/jsydghxk")
-public class JsydghxkController {
+public class JsydghxkController extends BaseController {
     @Autowired
     private JsydghxkService jsydghxkService;
 
-    @PostMapping("/add")
-    public R<Map> add(@RequestBody Jsydghxk jsydghxk) {
+    /**
+     * 添加建设用地规划许可
+     */
+    @PostMapping()
+    public R<Map> Add(@RequestBody JsydghxkVo jsydghxkVo) {
         try {
-            String id = jsydghxkService.add(jsydghxk);
+            Boolean b = jsydghxkService.isExit(jsydghxkVo.getProjectId());
+            if (b == true) {
+                return R.fail("此项目已添加建设用地规划许可");
+            }
+            String id = jsydghxkService.add(jsydghxkVo);
             Map<String, String> map = new HashMap<>();
             map.put("id", id);
             return R.ok(map);
@@ -32,20 +42,31 @@ public class JsydghxkController {
         }
     }
 
-    @GetMapping("/get/{id}")
-    public R<Jsydghxk> get(@PathVariable String id) {
+    /**
+     * 获取建设用地规划许可
+     *
+     * @param projectId 项目ID
+     * @return 建设用地规划许可
+     */
+    @GetMapping("/{projectId}")
+    public R<JsydghxkRes> Get(@PathVariable String projectId) {
         try {
-            Jsydghxk jsydghxk = jsydghxkService.get(id);
-            return R.ok(jsydghxk);
+            return R.ok(jsydghxkService.get(projectId));
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }
     }
 
-    @PostMapping("/update")
-    public R<Void> update(@RequestBody Jsydghxk jsydghxk) {
+    /**
+     * 更新建设用地规划许可
+     *
+     * @param jsydghxkUpdateVo 建设用地规划许可
+     * @return 操作结果
+     */
+    @PutMapping()
+    public R<Void> Update(@RequestBody JsydghxkUpdateVo jsydghxkUpdateVo) {
         try {
-            jsydghxkService.update(jsydghxk);
+            jsydghxkService.update(jsydghxkUpdateVo);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -24,7 +24,7 @@ public class Jsydghxk {
     private String jsgm;               // 建设规模
     private String zsbh;               // 证书编号
     private String fzjg;               // 发证机关
-    private String fzri;               // 发证日期
+    private String fzDate;               // 发证日期
     private Map<String, Object> attachment; // 附件
     private Boolean hasOnchain;        // 是否上链
     private String creatorId;          // 创建人ID

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

@@ -0,0 +1,13 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Jsydghxk;
+import lombok.Data;
+
+/**
+ * 建设用地规划许可 结果对象
+ */
+@Data
+public class JsydghxkRes extends Jsydghxk {
+    String projectName;// 项目名称
+    String projectCode;// 项目代码
+}

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

@@ -0,0 +1,12 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 建设用地规划许可 更新对象
+ */
+@Data
+public class JsydghxkUpdateVo extends JsydghxkVo {
+    private String id;
+    private Boolean hasOnchain;    // 是否上链
+}

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

@@ -0,0 +1,22 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 建设用地规划许可 视图对象
+ */
+@Data
+public class JsydghxkVo {
+    private String projectId;          // 项目ID
+    private String yddw;               // 用地单位
+    private String ydwz;               // 用地位置
+    private Float ydArea;              // 用地面积
+    private String tdyt;               // 土地用途
+    private String tdhqfs;             // 土地获取方式
+    private String pzydjg;             // 批准用地机关
+    private String pzydwh;             // 批准用地文号
+    private String jsgm;               // 建设规模
+    private String zsbh;               // 证书编号
+    private String fzjg;               // 发证机关
+    private String fzDate;               // 发证日期
+}

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

@@ -1,17 +1,36 @@
 package com.siwei.apply.mapper;
 
 import com.siwei.apply.domain.Jsydghxk;
+import com.siwei.apply.domain.vo.JsydghxkUpdateVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
-/**
- * 建设用地规划许可 Mapper 接口
- */
+// 建设用地规划许可 Mapper 接口
 @Mapper
 public interface JsydghxkMapper {
+    /**
+     * 根据项目id查询是否存在
+     */
+    Boolean isExit(String projectId);
+
+    /**
+     * 添加建设用地规划许可信息
+     *
+     * @param jsydghxk
+     */
     void add(Jsydghxk jsydghxk);
 
-    Jsydghxk get(@Param("id") String id);
+    /**
+     * 获取建设用地规划许可信息
+     *
+     * @param projectId
+     * @return
+     */
+    Jsydghxk get(String projectId);
 
-    void update(Jsydghxk jsydghxk);
+    /**
+     * 更新建设用地规划许可信息
+     *
+     * @param jsydghxkUpdateVo
+     */
+    void update(JsydghxkUpdateVo jsydghxkUpdateVo);
 }

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

@@ -1,14 +1,38 @@
 package com.siwei.apply.service;
 
-import com.siwei.apply.domain.Jsydghxk;
+import com.siwei.apply.domain.res.JsydghxkRes;
+import com.siwei.apply.domain.vo.JsydghxkUpdateVo;
+import com.siwei.apply.domain.vo.JsydghxkVo;
 
 /**
  * 建设用地规划许可 服务接口
  */
 public interface JsydghxkService {
-    String add(Jsydghxk jsydghxk);
+    /**
+     * 根据项目projectId查询是否存在
+     */
+    Boolean isExit(String projectId);
 
-    Jsydghxk get(String id);
+    /**
+     * 添加建设用地规划许可信息
+     *
+     * @param jsydghxkVo 建设用地规划许可视图对象
+     * @return 建设用地规划许可ID
+     */
+    String add(JsydghxkVo jsydghxkVo);
 
-    void update(Jsydghxk jsydghxk);
+    /**
+     * 获取建设用地规划许可信息
+     *
+     * @param projectId 项目ID
+     * @return 建设用地规划许可结果对象
+     */
+    JsydghxkRes get(String projectId);
+
+    /**
+     * 更新建设用地规划许可信息
+     *
+     * @param jsydghxkUpdateVo 建设用地规划许可更新视图对象
+     */
+    void update(JsydghxkUpdateVo jsydghxkUpdateVo);
 }

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

@@ -1,8 +1,14 @@
 package com.siwei.apply.service.impl;
 
 import com.siwei.apply.domain.Jsydghxk;
+import com.siwei.apply.domain.Project;
+import com.siwei.apply.domain.res.JsydghxkRes;
+import com.siwei.apply.domain.vo.JsydghxkUpdateVo;
+import com.siwei.apply.domain.vo.JsydghxkVo;
 import com.siwei.apply.mapper.JsydghxkMapper;
+import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.service.JsydghxkService;
+import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,12 +19,20 @@ import static com.siwei.apply.common.Common.UserId;
  */
 @Service
 public class JsydghxkImpl implements JsydghxkService {
-
     @Autowired
     private JsydghxkMapper jsydghxkMapper;
+    @Autowired
+    private ProjectMapper projectMapper;
+
+    @Override
+    public Boolean isExit(String projectId) {
+        return jsydghxkMapper.isExit(projectId);
+    }
 
     @Override
-    public String add(Jsydghxk jsydghxk) {
+    public String add(JsydghxkVo jsydghxkVo) {
+        Jsydghxk jsydghxk = new Jsydghxk();
+        BeanUtils.copyProperties(jsydghxkVo, jsydghxk);
         jsydghxk.generateId();
         jsydghxk.setCreatorId(UserId);
         jsydghxkMapper.add(jsydghxk);
@@ -26,12 +40,19 @@ public class JsydghxkImpl implements JsydghxkService {
     }
 
     @Override
-    public Jsydghxk get(String id) {
-        return jsydghxkMapper.get(id);
+    public JsydghxkRes get(String projectId) {
+        Jsydghxk jsydghxk = jsydghxkMapper.get(projectId);
+        Project project = projectMapper.get(projectId);
+
+        JsydghxkRes jsydghxkRes = new JsydghxkRes();
+        BeanUtils.copyProperties(jsydghxk, jsydghxkRes);
+        jsydghxkRes.setProjectName(project.getName());
+        jsydghxkRes.setProjectCode(project.getCode());
+        return jsydghxkRes;
     }
 
     @Override
-    public void update(Jsydghxk jsydghxk) {
-        jsydghxkMapper.update(jsydghxk);
+    public void update(JsydghxkUpdateVo jsydghxkUpdateVo) {
+        jsydghxkMapper.update(jsydghxkUpdateVo);
     }
 }

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

@@ -18,7 +18,7 @@
         <result property="jsgm" column="jsgm"/>
         <result property="zsbh" column="zsbh"/>
         <result property="fzjg" column="fzjg"/>
-        <result property="fzri" column="fzri"/>
+        <result property="fzDate" column="fz_date"/>
         <result property="attachment" column="attachment" typeHandler="com.siwei.apply.handler.JsonbTypeHandler"/>
         <result property="hasOnchain" column="has_onchain"/>
         <result property="creatorId" column="creator_id"/>
@@ -26,23 +26,29 @@
         <result property="updatedAt" column="updated_at"/>
     </resultMap>
 
+    <select id="isExit" resultType="Boolean">
+        SELECT COUNT(1) > 0
+        FROM t_jsydghxk
+        WHERE project_id = #{projectId}
+    </select>
+
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Jsydghxk">
         INSERT INTO t_jsydghxk (id, project_id, yddw, ydwz, yd_area, tdyt, tdhqfs, pzydjg, pzydwh,
-                                jsgm, zsbh, fzjg, fzri, has_onchain, creator_id, created_at, updated_at)
+                                jsgm, zsbh, fzjg, fz_date, has_onchain, creator_id, created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{yddw}, #{ydwz}, #{ydArea}, #{tdyt}, #{tdhqfs}, #{pzydjg}, #{pzydwh},
-                #{jsgm}, #{zsbh}, #{fzjg}, #{fzri}, false, #{creatorId}, now(), now())
+                #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, false, #{creatorId}, now(), now())
     </insert>
 
-    <!-- 根据ID获取记录 -->
+    <!-- 根据项目ID获取记录 -->
     <select id="get" resultMap="BaseResultMap" parameterType="String">
         SELECT *
         FROM t_jsydghxk
-        WHERE id = #{id}
+        WHERE project_id = #{projectId}
     </select>
 
-    <!-- 根据ID更新记录 -->
-    <update id="update" parameterType="com.siwei.apply.domain.Jsydghxk">
+    <!-- 更新记录 -->
+    <update id="update" parameterType="com.siwei.apply.domain.vo.JsydghxkUpdateVo">
         UPDATE t_jsydghxk
         <set>
             <if test="projectId != null">project_id = #{projectId},</if>
@@ -56,9 +62,8 @@
             <if test="jsgm != null">jsgm = #{jsgm},</if>
             <if test="zsbh != null">zsbh = #{zsbh},</if>
             <if test="fzjg != null">fzjg = #{fzjg},</if>
-            <if test="fzri != null">fzri = #{fzri},</if>
+            <if test="fzDate != null">fz_date = #{fzDate},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
-            <if test="creatorId != null">creator_id = #{creatorId},</if>
             updated_at = now()
         </set>
         WHERE id = #{id}