新增项目增加宗地码修改

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

@@ -45,7 +45,6 @@ public class ProjectController extends BaseController {
             if(StringUtils.isNotBlank(code) && !code.matches(regex)){
                 return R.fail(501,"项目编码格式不正确，正确格式为：YYYY-XXXXXX-XX-XX-XXXXXX，例如：2023-123456-01-01-000001");
             }
-
             String id = projectService.add(projectVo);
             map.put("id", id);
             return R.ok(map);

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

@@ -24,8 +24,10 @@ public class Project extends BaseId {
     private Date updateAt;
     private Integer projectType;
     private Integer onChainNum;
-    private String creatorId;
+    private String firstPlotCode;
+    private String secondPlotCode;
 
+    private String creatorId;
     private String currentNode;
     private String envelope;
     private String shppath;
@@ -34,4 +36,5 @@ public class Project extends BaseId {
     private String geoms;
 
 
+
 }

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

@@ -9,4 +9,6 @@ public class ProjectVo {
     private String company;
     private Integer projectType;
     private Integer onChainNum;
+    private String firstPlotCode;
+    private String secondPlotCode;
 }

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

@@ -70,6 +70,8 @@ public class ProjectImpl implements ProjectService {
         project.setCode(projectVo.getCode());
         project.setCompany(projectVo.getCompany());
         project.setProjectType(projectVo.getProjectType());
+        project.setFirstPlotCode(projectVo.getFirstPlotCode());
+        project.setSecondPlotCode(projectVo.getSecondPlotCode());
         project.setCreatorId(UserId);
         projectMapper.add(project);
 

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

@@ -13,13 +13,16 @@
         <result column="project_type" property="projectType"/>
         <result column="on_chain_num" property="onChainNum"/>
         <result column="creator_id" property="creatorId"/>
+        <result column="first_plot_code" property="firstPlotCode"/>
+        <result column="second_plot_code" property="secondPlotCode"/>
     </resultMap>
 
     <insert id="add" parameterType="com.siwei.apply.domain.Project">
         INSERT INTO t_project (id, name, code, company,
-                               created_at, updated_at, project_type, creator_id)
+                               created_at, updated_at, project_type,first_plot_code,second_plot_code, creator_id)
         VALUES (#{id}, #{name}, #{code}, #{company}, now(), now(), #{projectType},
-                #{creatorId})
+        #{firstPlotCode},#{secondPlotCode},
+        #{creatorId})
     </insert>
 
     <select id="get" resultMap="projectMap">
@@ -84,6 +87,8 @@
             <if test="company != null">company = #{company},</if>
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="onChainNum != null">on_chain_num = #{onChainNum},</if>
+            <if test="firstPlotCode != null">first_plot_code = #{firstPlotCode},</if>
+            <if test="secondPlotCode != null">second_plot_code = #{secondPlotCode},</if>
             updated_at = now()
         </set>
         WHERE id = #{id}