土地供应相关代码修改

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

@@ -1,8 +1,11 @@
 package com.siwei.apply.controller;
 
-import com.siwei.apply.domain.Tdgy;
+import com.siwei.apply.domain.res.TdgyRes;
+import com.siwei.apply.domain.vo.TdgyUpdateVo;
+import com.siwei.apply.domain.vo.TdgyVo;
 import com.siwei.apply.service.TdgyService;
 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,17 +19,21 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/tdgy")
-public class TdgyController {
+public class TdgyController extends BaseController {
     @Autowired
     private TdgyService tdgyService;
 
     /**
-     * 添加供地信息
+     * 添加土地供应
      */
     @PostMapping()
-    public R<Map> add(@RequestBody Tdgy tdgy) {
+    public R<Map> Add(@RequestBody TdgyVo tdgyVo) {
         try {
-            String id = tdgyService.add(tdgy);
+            Boolean b = tdgyService.isExit(tdgyVo.getProjectId());
+            if (b == true) {
+                return R.fail("此项目已添加土地供应");
+            }
+            String id = tdgyService.add(tdgyVo);
             Map<String, String> map = new HashMap<>();
             map.put("id", id);
             return R.ok(map);
@@ -36,25 +43,30 @@ public class TdgyController {
     }
 
     /**
-     * 根据 ID 获取供地信息
+     * 获取土地供应
+     *
+     * @param projectId 项目ID
+     * @return 土地供应
      */
-    @GetMapping("/{id}")
-    public R<Tdgy> get(@PathVariable("id") String id) {
+    @GetMapping("/{projectId}")
+    public R<TdgyRes> Get(@PathVariable String projectId) {
         try {
-            Tdgy tdgy = tdgyService.get(id);
-            return R.ok(tdgy);
+            return R.ok(tdgyService.get(projectId));
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }
     }
 
     /**
-     * 更新供地信息（按非空字段更新）
+     * 更新土地供应
+     *
+     * @param tdgyUpdateVo 土地供应
+     * @return 操作结果
      */
-    @PutMapping("")
-    public R<Void> update(@RequestBody Tdgy tdgy) {
+    @PutMapping()
+    public R<Void> Update(@RequestBody TdgyUpdateVo tdgyUpdateVo) {
         try {
-            tdgyService.update(tdgy);
+            tdgyService.update(tdgyUpdateVo);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -23,8 +23,7 @@ public class Tdgy {
     private Boolean hasZz;         // 是否征转
     private String hbcrfapfwh;     // 用地划拨/出让方案批复文号
     private String hbcrhtbh;       // 划拨决定书/出让合同编号
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date hbcrhtDate;       // 划拨决定书/出让合同日期
+    private String hbcrhtDate;       // 划拨决定书/出让合同日期
     private Map<String, Object> attachment;     // 附件
     private Boolean hasOnchain;    // 是否上链
     private String creatorId;      // 创建人ID

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

@@ -0,0 +1,13 @@
+package com.siwei.apply.domain.res;
+
+import com.siwei.apply.domain.Tdgy;
+import lombok.Data;
+
+/**
+ * 土地供应 结果对象
+ */
+@Data
+public class TdgyRes extends Tdgy {
+    String projectName;// 项目名称
+    String projectCode;// 项目代码
+}

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

@@ -0,0 +1,12 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 土地供应 更新对象
+ */
+@Data
+public class TdgyUpdateVo extends TdgyVo {
+    private String id;
+    private Boolean hasOnchain;    // 是否上链
+}

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

@@ -0,0 +1,21 @@
+package com.siwei.apply.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 土地供应 视图对象
+ */
+@Data
+public class TdgyVo {
+    private String projectId;      // 项目ID
+    private String srf;            // 土地受让人
+    private String tdyt;           // 土地用途
+    private String jswz;           // 建设位置
+    private Float gdArea;          // 供地面积
+    private String gdType;         // 供地方式
+    private Boolean hasZz;         // 是否征转
+    private String hbcrfapfwh;     // 用地划拨/出让方案批复文号
+    private String hbcrhtbh;       // 划拨决定书/出让合同编号
+    private String hbcrhtDate;       // 划拨决定书/出让合同日期
+
+}

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

@@ -1,30 +1,36 @@
 package com.siwei.apply.mapper;
 
 import com.siwei.apply.domain.Tdgy;
+import com.siwei.apply.domain.vo.TdgyUpdateVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
+// 土地供应 Mapper 接口
 @Mapper
 public interface TdgyMapper {
+    /**
+     * 根据项目id查询是否存在
+     */
+    Boolean isExit(String projectId);
 
     /**
-     * 添加记录
-     * @param tdgy 实体
-     * @return 插入成功条数
+     * 添加土地供应信息
+     *
+     * @param tdgy
      */
-    int add(Tdgy tdgy);
+    void add(Tdgy tdgy);
 
     /**
-     * 根据ID获取记录
-     * @param id 主键ID
-     * @return Tdgy 对象
+     * 获取土地供应信息
+     *
+     * @param projectId
+     * @return
      */
-    Tdgy get(@Param("id") String id);
+    Tdgy get(String projectId);
 
     /**
-     * 更新记录
-     * @param tdgy 实体
-     * @return 更新成功条数
+     * 更新土地供应信息
+     *
+     * @param tdgyUpdateVo
      */
-    int update(Tdgy tdgy);
+    void update(TdgyUpdateVo tdgyUpdateVo);
 }

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

@@ -1,32 +1,38 @@
 package com.siwei.apply.service;
 
-import com.siwei.apply.domain.Tdgy;
+import com.siwei.apply.domain.res.TdgyRes;
+import com.siwei.apply.domain.vo.TdgyUpdateVo;
+import com.siwei.apply.domain.vo.TdgyVo;
 
 /**
  * 土地供应 服务接口
  */
 public interface TdgyService {
     /**
-     * 添加一条供地记录
+     * 根据项目projectId查询是否存在
+     */
+    Boolean isExit(String projectId);
+
+    /**
+     * 添加土地供应信息
      *
-     * @param tdgy Tdgy 对象
-     * @return 插入是否成功
+     * @param tdgyVo 土地供应视图对象
+     * @return 土地供应ID
      */
-    String add(Tdgy tdgy);
+    String add(TdgyVo tdgyVo);
 
     /**
-     * 根据 ID 获取供地信息
+     * 获取土地供应信息
      *
-     * @param id 主键
-     * @return Tdgy 对象
+     * @param projectId 项目ID
+     * @return 土地供应结果对象
      */
-    Tdgy get(String id);
+    TdgyRes get(String projectId);
 
     /**
-     * 更新供地信息
+     * 更新土地供应信息
      *
-     * @param tdgy Tdgy 对象
-     * @return 更新是否成功
+     * @param tdgyUpdateVo 土地供应更新视图对象
      */
-    void update(Tdgy tdgy);
+    void update(TdgyUpdateVo tdgyUpdateVo);
 }

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

@@ -1,8 +1,14 @@
 package com.siwei.apply.service.impl;
 
+import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.Tdgy;
+import com.siwei.apply.domain.res.TdgyRes;
+import com.siwei.apply.domain.vo.TdgyUpdateVo;
+import com.siwei.apply.domain.vo.TdgyVo;
+import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.TdgyMapper;
 import com.siwei.apply.service.TdgyService;
+import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,9 +21,18 @@ import static com.siwei.apply.common.Common.UserId;
 public class TdgyImpl implements TdgyService {
     @Autowired
     private TdgyMapper tdgyMapper;
+    @Autowired
+    private ProjectMapper projectMapper;
 
     @Override
-    public String add(Tdgy tdgy) {
+    public Boolean isExit(String projectId) {
+        return tdgyMapper.isExit(projectId);
+    }
+
+    @Override
+    public String add(TdgyVo tdgyVo) {
+        Tdgy tdgy = new Tdgy();
+        BeanUtils.copyProperties(tdgyVo, tdgy);
         tdgy.generateId();
         tdgy.setCreatorId(UserId);
         tdgyMapper.add(tdgy);
@@ -25,12 +40,19 @@ public class TdgyImpl implements TdgyService {
     }
 
     @Override
-    public Tdgy get(String id) {
-        return tdgyMapper.get(id);
+    public TdgyRes get(String projectId) {
+        Tdgy tdgy = tdgyMapper.get(projectId);
+        Project project = projectMapper.get(projectId);
+
+        TdgyRes tdgyRes = new TdgyRes();
+        BeanUtils.copyProperties(tdgy, tdgyRes);
+        tdgyRes.setProjectName(project.getName());
+        tdgyRes.setProjectCode(project.getCode());
+        return tdgyRes;
     }
 
     @Override
-    public void update(Tdgy tdgy) {
-        tdgyMapper.update(tdgy);
+    public void update(TdgyUpdateVo tdgyUpdateVo) {
+        tdgyMapper.update(tdgyUpdateVo);
     }
 }

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

@@ -24,6 +24,12 @@
         <result property="updatedAt" column="updated_at"/>
     </resultMap>
 
+    <select id="isExit" resultType="Boolean">
+        SELECT COUNT(1) > 0
+        FROM t_tdgy
+        WHERE project_id = #{projectId}
+    </select>
+
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Tdgy">
         INSERT INTO t_tdgy (id, project_id, srf, tdyt, jswz,
@@ -36,15 +42,15 @@
                 now(), now())
     </insert>
 
-    <!-- 根据ID获取记录 -->
+    <!-- 根据项目ID获取记录 -->
     <select id="get" resultMap="BaseResultMap" parameterType="String">
         SELECT *
         FROM t_tdgy
-        WHERE id = #{id}
+        WHERE project_id = #{projectId}
     </select>
 
-    <!-- 根据ID更新记录 -->
-    <update id="update" parameterType="com.siwei.apply.domain.Tdgy">
+    <!-- 更新记录 -->
+    <update id="update" parameterType="com.siwei.apply.domain.vo.TdgyUpdateVo">
         UPDATE t_tdgy
         <set>
             <if test="projectId != null">project_id = #{projectId},</if>
@@ -57,10 +63,8 @@
             <if test="hbcrfapfwh != null">hbcrfapfwh = #{hbcrfapfwh},</if>
             <if test="hbcrhtbh != null">hbcrhtbh = #{hbcrhtbh},</if>
             <if test="hbcrhtDate != null">hbcrht_date = #{hbcrhtDate},</if>
-            <if test="attachment != null">attachment = #{attachment},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
-            <if test="creatorId != null">creator_id = #{creatorId},</if>
-            updated_at= now()
+            updated_at = now()
         </set>
         WHERE id = #{id}
     </update>