国有建设用地使用权及房屋所有权首次登记，修改为按照业务号展示

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

@@ -13,18 +13,18 @@ import java.util.UUID;
 @Data
 public class Gyjsydjfwscdj extends BaseId {
     private String projectId;      // 项目ID
-    private String qlr;            // 权利人
-    private String gyqk;           // 共有情况
-    private String zl;             // 坐落
-    private String qllx;           // 权利类型
-    private String qlxz;           // 权利性质
-    private String tdyt;           // 土地用途
-    private String area;           // 面积
-    private String areaUnit;       // 面积单位
-    private String bdcdyh;         // 不动产单元号
-    private String bdczh;          // 不动产证号
-    private String djjg;           // 登记结构
-    private String djDate;           // 登记日期
+    private String ywh;            // 业务号
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date gzdgzsj;         // 告知单盖章时间
+    private String kfdw;          // 开发单位
+    private String bdcqk;         // 不动产情况
+    private String jzmj;          // 建筑面积
+    private String jzmjDw;         // 建筑面积单位
+    private String tnmj;           // 套内面积
+    private String tnmjDw;          // 套内面积单位
+    private String ftmj;           // 分摊面积
+    private String ftmjDw;         // 分摊面积单位
+    private String bz;            // 备注（数据清单）
     private Map<String, Object> attachment;     // 附件
     private Boolean hasOnchain;    // 是否上链
     private String creatorId;      // 创建人ID

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

@@ -1,23 +1,26 @@
 package com.siwei.apply.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 国有建设用地使用权及房屋所有权首次登记 视图对象
  */
 @Data
 public class GyjsydjfwscdjVo {
     private String projectId;      // 项目ID
-    private String qlr;            // 权利人
-    private String gyqk;           // 共有情况
-    private String zl;             // 坐落
-    private String qllx;           // 权利类型
-    private String qlxz;           // 权利性质
-    private String tdyt;           // 土地用途
-    private String area;           // 面积
-    private String areaUnit;       // 面积单位
-    private String bdcdyh;         // 不动产单元号
-    private String bdczh;          // 不动产证号
-    private String djjg;           // 登记结构
-    private String djDate;         // 登记日期
+    private String ywh;            // 业务号
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date gzdgzsj;         // 告知单盖章时间
+    private String kfdw;          // 开发单位
+    private String bdcqk;         // 不动产情况
+    private String jzmj;          // 建筑面积
+    private String jzmjDw;         // 建筑面积单位
+    private String tnmj;           // 套内面积
+    private String tnmjDw;          // 套内面积单位
+    private String ftmj;           // 分摊面积
+    private String ftmjDw;         // 分摊面积单位
+    private String bz;            // 备注（数据清单）
 }

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

@@ -253,7 +253,6 @@ public class ProjectImpl implements ProjectService {
                         }
                     }
                     projectWorkflowRes.setCreatedAt(businessDate);
-
                     String viewField = "";
                     String tableName = projectWorkflowRes.getNodeTableName();
                     if(AloneWorkFlowEnum.NODE_0.getTableName().equalsIgnoreCase(tableName)){
@@ -266,6 +265,14 @@ public class ProjectImpl implements ProjectService {
                         viewField =  currentNode.get("srf") != null ? String.valueOf(currentNode.get("srf")) : "";
                     } else if (AloneWorkFlowEnum.NODE_3.getTableName().equalsIgnoreCase(tableName)) {
                         viewField = currentNode.get("bdcdyh") != null ? String.valueOf(currentNode.get("bdcdyh")) : "";
+                    }else if (AloneWorkFlowEnum.NODE_4.getTableName().equalsIgnoreCase(tableName)) {
+                        viewField = currentNode.get("zsbh") != null ? String.valueOf(currentNode.get("zsbh")) : "";
+                    }else if (AloneWorkFlowEnum.NODE_5.getTableName().equalsIgnoreCase(tableName)) {
+                        viewField = currentNode.get("zsbh") != null ? String.valueOf(currentNode.get("zsbh")) : "";
+                    }else if (AloneWorkFlowEnum.NODE_6.getTableName().equalsIgnoreCase(tableName)) {
+                        viewField = currentNode.get("hgzh") != null ? String.valueOf(currentNode.get("hgzh")) : "";
+                    }else if (AloneWorkFlowEnum.NODE_7.getTableName().equalsIgnoreCase(tableName)) {
+                        viewField = currentNode.get("ywh") != null ? String.valueOf(currentNode.get("ywh")) : "";
                     }
                     projectWorkflowRes.setViewField(viewField);
                 }

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

@@ -136,20 +136,20 @@ public class OfferDataServiceImpl implements OfferDataService {
         try {
             GyjsydjfwscdjVo gyjsydjfwscdjVo = new GyjsydjfwscdjVo();
             gyjsydjfwscdjVo.setProjectId(body.getXmbh());
-            gyjsydjfwscdjVo.setQlr(body.getQlr());
-            gyjsydjfwscdjVo.setGyqk(body.getGyqk());
-            gyjsydjfwscdjVo.setZl(body.getZl());
-            gyjsydjfwscdjVo.setQllx(body.getQllx());
-            gyjsydjfwscdjVo.setQlxz(body.getQlxz());
-            gyjsydjfwscdjVo.setTdyt(body.getTdyt());
-            if (StringUtils.isNotBlank(body.getTdmj())) {
-                gyjsydjfwscdjVo.setArea(body.getTdmj());
-            }
-            gyjsydjfwscdjVo.setAreaUnit(body.getTdmjdw());
-            gyjsydjfwscdjVo.setBdcdyh(StringUtils.isNotBlank(body.getBdcdyh()) ? body.getBdcdyh() : body.getYfbdcdyh());
-            gyjsydjfwscdjVo.setBdczh(body.getBdczh());
-            gyjsydjfwscdjVo.setDjjg(body.getDjjg());
-            gyjsydjfwscdjVo.setDjDate(body.getDjrq());
+
+//            gyjsydjfwscdjVo.setYwh(body.getYwh());
+//            gyjsydjfwscdjVo.setGzdgzsj(body.getGzdgzsj());
+//            gyjsydjfwscdjVo.setKfdw(body.getKfdw());
+//            gyjsydjfwscdjVo.setBdcqk(body.getBdcqk());
+//            if (StringUtils.isNotBlank(body.getJzmj())) {
+//                gyjsydjfwscdjVo.setJzmj(body.getJzmj());
+//            }
+//            gyjsydjfwscdjVo.setJzmjDw(body.getJzmjDw());
+//            gyjsydjfwscdjVo.setTnmj(body.getTnmj());
+//            gyjsydjfwscdjVo.setTnmjDw(body.getTnmjDw());
+//            gyjsydjfwscdjVo.setFtmj(body.getFtmj());
+//            gyjsydjfwscdjVo.setFtmjDw(body.getFtmjDw());
+//            gyjsydjfwscdjVo.setBz(body.getBz());
 
             String nodeId = gyjsydjfwscdjService.add(gyjsydjfwscdjVo);
             Map<String, Object> map1 = new HashMap<>();

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

@@ -8,19 +8,17 @@
     <resultMap id="BaseResultMap" type="com.siwei.apply.domain.Gyjsydjfwscdj">
         <id property="id" column="id"/>
         <result property="projectId" column="project_id"/>
-        <result property="qlr" column="qlr"/>
-        <result property="gyqk" column="gyqk"/>
-        <result property="zl" column="zl"/>
-        <result property="qllx" column="qllx"/>
-        <result property="qlxz" column="qlxz"/>
-        <result property="tdyt" column="tdyt"/>
-        <result property="area" column="area"/>
-        <!-- 新增：面积单位映射 -->
-        <result property="areaUnit" column="area_unit"/>
-        <result property="bdcdyh" column="bdcdyh"/>
-        <result property="bdczh" column="bdczh"/>
-        <result property="djjg" column="djjg"/>
-        <result property="djDate" column="dj_date"/>
+        <result property="ywh" column="ywh"/>
+        <result property="gzdgzsj" column="gzdgzsj"/>
+        <result property="kfdw" column="kfdw"/>
+        <result property="bdcqk" column="bdcqk"/>
+        <result property="jzmj" column="jzmj"/>
+        <result property="jzmjDw" column="jzmj_dw"/>
+        <result property="tnmj" column="tnmj"/>
+        <result property="tnmjDw" column="tnmj_dw"/>
+        <result property="ftmj" column="ftmj"/>
+        <result property="ftmjDw" column="ftmj_dw"/>
+        <result property="bz" column="bz"/>
         <result property="hasOnchain" column="has_onchain"/>
         <result property="creatorId" column="creator_id"/>
         <result property="createdAt" column="created_at"/>
@@ -35,14 +33,12 @@
 
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Gyjsydjfwscdj">
-        INSERT INTO t_gyjsydjfwscdj (id, project_id, qlr, gyqk, zl,
-                                     qllx, qlxz, tdyt, area, area_unit, bdcdyh,
-                                     bdczh, djjg, dj_date, has_onchain, creator_id,
-                                     created_at, updated_at)
-        VALUES (#{id}, #{projectId}, #{qlr}, #{gyqk}, #{zl},
-                #{qllx}, #{qlxz}, #{tdyt}, #{area}, #{areaUnit}, #{bdcdyh},
-                #{bdczh}, #{djjg}, #{djDate}, false, #{creatorId},
-                now(), now())
+        INSERT INTO t_gyjsydjfwscdj (id, project_id, ywh, gzdgzsj, kfdw, bdcqk,
+                                     jzmj, jzmj_dw, tnmj, tnmj_dw, ftmj, ftmj_dw,
+                                     bz, has_onchain, creator_id, created_at, updated_at)
+        VALUES (#{id}, #{projectId}, #{ywh}, #{gzdgzsj}, #{kfdw}, #{bdcqk},
+                #{jzmj}, #{jzmjDw}, #{tnmj}, #{tnmjDw}, #{ftmj}, #{ftmjDw},
+                #{bz}, false, #{creatorId}, now(), now())
     </insert>
 
     <!-- 根据项目ID获取记录（返回全部，按创建时间升序） -->
@@ -65,19 +61,17 @@
         UPDATE t_gyjsydjfwscdj
         <set>
             <if test="projectId != null">project_id = #{projectId},</if>
-            <if test="qlr != null">qlr = #{qlr},</if>
-            <if test="gyqk != null">gyqk = #{gyqk},</if>
-            <if test="zl != null">zl = #{zl},</if>
-            <if test="qllx != null">qllx = #{qllx},</if>
-            <if test="qlxz != null">qlxz = #{qlxz},</if>
-            <if test="tdyt != null">tdyt = #{tdyt},</if>
-            <if test="area != null">area = #{area},</if>
-            <!-- 新增：面积单位可选更新 -->
-            <if test="areaUnit != null">area_unit = #{areaUnit},</if>
-            <if test="bdcdyh != null">bdcdyh = #{bdcdyh},</if>
-            <if test="bdczh != null">bdczh = #{bdczh},</if>
-            <if test="djjg != null">djjg = #{djjg},</if>
-            <if test="djDate != null">dj_date = #{djDate},</if>
+            <if test="ywh != null">ywh = #{ywh},</if>
+            <if test="gzdgzsj != null">gzdgzsj = #{gzdgzsj},</if>
+            <if test="kfdw != null">kfdw = #{kfdw},</if>
+            <if test="bdcqk != null">bdcqk = #{bdcqk},</if>
+            <if test="jzmj != null">jzmj = #{jzmj},</if>
+            <if test="jzmjDw != null">jzmj_dw = #{jzmjDw},</if>
+            <if test="tnmj != null">tnmj = #{tnmj},</if>
+            <if test="tnmjDw != null">tnmj_dw = #{tnmjDw},</if>
+            <if test="ftmj != null">ftmj = #{ftmj},</if>
+            <if test="ftmjDw != null">ftmj_dw = #{ftmjDw},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>