全环节增加备注调整text格式

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

@@ -26,6 +26,7 @@ public class Gyjsydscdj extends BaseId{
     private String bdczh;          // 不动产证号
     private String djjg;           // 登记结构
     private String djDate;           // 登记日期
+    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/Jsgcghxk.java

@@ -20,6 +20,7 @@ public class Jsgcghxk extends BaseId {
     private String fzjg; // 发证机关
 
     private String fzDate; // 发证日期
+    private String bz; // 备注（数据清单）
     private String attachment; // 附件
     private Boolean hasOnchain; // 是否上链
     private String creatorId; // 创建人ID

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

@@ -23,6 +23,7 @@ public class Jsydghxk extends BaseId {
     private String zsbh;               // 证书编号
     private String fzjg;               // 发证机关
     private String fzDate;               // 发证日期
+    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/Tdgy.java

@@ -22,6 +22,7 @@ public class Tdgy extends BaseId {
     private String hbcrfapfwh;     // 用地划拨/出让方案批复文号
     private String hbcrhtbh;       // 划拨决定书/出让合同编号
     private String hbcrhtDate;       // 划拨决定书/出让合同日期
+    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/Tdhyhs.java

@@ -23,6 +23,7 @@ public class Tdhyhs extends BaseId {
     private String gljsgcghxkh;         // 关联建设工程规划许可号
     // 新增字段
     private String hyyj;                // 审核意见
+    private String bz;                  // 备注（数据清单）
 
     private Boolean hasOnchain;         // 是否上链
     private String creatorId;           // 创建人ID

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

@@ -19,6 +19,7 @@ public class Tjyydhx extends BaseId {
     private String cjbh;           // 出具编号
     private String cjDate;           // 出具日期
     private String cjyj;           // 出具意见
+    private String bz;             // 备注（数据清单）
     private String creatorId;      // 创建人ID
     private Boolean hasOnchain;    // 是否上链
 

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

@@ -20,6 +20,7 @@ public class Ydbp extends BaseId {
     private String bpDate;//报批日期
     private String pfwh;//批复文号
     private String pfDate;//批复日期
+    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/YdbpData.java

@@ -19,6 +19,7 @@ public class YdbpData extends BaseId {
     private String bpDate;
     private String pfwh;
     private String pfDate;
+    private String bz;
     private String creatorId;
     private Boolean hasOnchain;    // 是否上链
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -21,6 +21,7 @@ public class Ydysyxz extends BaseId {
     private String xmjsyj;//项目建设依据
     private String zzwh;//证书文号
     private String fzDate;//发证日期
+    private String bz;//备注（数据清单）
     // JSONB 对应 Java 的 Map 或自定义对象
     private Map<String, Object> attachment;//存储附件的目录树
     private Boolean hasOnchain = false;//是否上链

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

@@ -20,5 +20,6 @@ public class GyjsydscdjVo {
     private String bdczh;          // 不动产证号
     private String djjg;           // 登记结构
     private String djDate;         // 登记日期
+    private String bz;             // 备注（数据清单）
     private String sourceId;       // 来源ID
 }

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

@@ -16,5 +16,6 @@ public class JsgcghxkVo {
     private String zsbh; // 证书编号
     private String fzjg; // 发证机关
     private String fzDate; // 发证日期
+    private String bz; // 备注（数据清单）
     private String sourceId; // 同步表id
 }

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

@@ -20,5 +20,6 @@ public class JsydghxkVo {
     private String zsbh;               // 证书编号
     private String fzjg;               // 发证机关
     private String fzDate;               // 发证日期
+    private String bz;                   // 备注（数据清单）
     private String sourceId;            // 同步表id
 }

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

@@ -18,4 +18,5 @@ public class TdgyVo {
     private String hbcrhtbh;       // 划拨决定书/出让合同编号
     private String hbcrhtDate;       // 划拨决定书/出让合同日期
     private String gdUnit;        // 供地单位
+    private String bz;            // 备注（数据清单）
 }

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

@@ -15,6 +15,7 @@ public class TdhyhsVo {
     private String jsdw;                // 建设单位
     private String gljsgcghxkh;         // 关联建设工程规划许可号
     private String hyyj;                // 核验意见
+    private String bz;                  // 备注（数据清单）
     private String sourceId;            // 同步表id
 
 }

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

@@ -16,5 +16,6 @@ public class TjyydhxVo {
     private String cjbh;           // 出具编号
     private String cjDate;           // 出具日期
     private String cjyj;           // 出具依据
+    private String bz;             // 备注（数据清单）
 
 }

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

@@ -16,4 +16,5 @@ public class YdbpDataVo {
     private String bpDate;
     private String pfwh;
     private String pfDate;
+    private String bz;
 }

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

@@ -19,4 +19,5 @@ public class YdbpVo {
 
     private String ydUnit; // 用地面积单位
     private String zsUnit; // 征收面积单位
+    private String bz; // 备注（数据清单）
 }

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

@@ -16,5 +16,6 @@ public class YdysyxzVo {
     private String xmjsyj;//项目建设依据
     private String zzwh;//证书文号
     private String fzDate;//发证日期
+    private String bz;//备注（数据清单）
     private Boolean hasOnchain;//是否上链
 }

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

@@ -23,6 +23,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -33,10 +34,10 @@
 
     <insert id="add" parameterType="com.siwei.apply.domain.Gyjsydscdj">
         INSERT INTO t_gyjsydscdj (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, source_id)
+                                  bz, has_onchain, creator_id, created_at, updated_at, source_id)
         VALUES (#{id}, #{projectId}, #{qlr}, #{gyqk}, #{zl}, #{qllx}, #{qlxz}, #{tdyt}, #{area}, #{areaUnit}, #{bdcdyh}, #{bdczh},
                 #{djjg}, #{djDate},
-                #{hasOnchain}, #{creatorId}, now(), now(), #{sourceId})
+                #{bz}, #{hasOnchain}, #{creatorId}, now(), now(), #{sourceId})
     </insert>
 
     <!-- 根据项目ID获取记录（返回全部，按创建时间升序） -->
@@ -80,6 +81,7 @@
             <if test="bdczh != null">bdczh = #{bdczh},</if>
             <if test="djjg != null">djjg = #{djjg},</if>
             <if test="djDate != null">dj_date = #{djDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

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

@@ -23,6 +23,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -33,9 +34,9 @@
 
     <!-- 新增 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Jsgcghxk">
-        INSERT INTO t_jsgcghxk (id, project_id, ydwz, yddw, qs, djq, jsgm, zsbh, fzjg, fz_date, has_onchain,
+        INSERT INTO t_jsgcghxk (id, project_id, ydwz, yddw, qs, djq, jsgm, zsbh, fzjg, fz_date, bz, has_onchain,
                                 creator_id, created_at, updated_at,source_id)
-        VALUES (#{id}, #{projectId}, #{ydwz}, #{yddw}, #{qs}, #{djq}, #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate},
+        VALUES (#{id}, #{projectId}, #{ydwz}, #{yddw}, #{qs}, #{djq}, #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, #{bz},
                 false, #{creatorId}, now(), now(),#{sourceId})
     </insert>
 
@@ -67,6 +68,7 @@
             <if test="zsbh != null">zsbh = #{zsbh},</if>
             <if test="fzjg != null">fzjg = #{fzjg},</if>
             <if test="fzDate != null">fz_date = #{fzDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

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

@@ -26,6 +26,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -37,9 +38,9 @@
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Jsydghxk">
         INSERT INTO t_jsydghxk (id, project_id, yddw, ydwz, yd_area, yd_unit, tdyt, tdhqfs, pzydjg, pzydwh,
-                                jsgm, zsbh, fzjg, fz_date, has_onchain, creator_id, created_at, updated_at, source_id)
+                                jsgm, zsbh, fzjg, fz_date, bz, has_onchain, creator_id, created_at, updated_at, source_id)
         VALUES (#{id}, #{projectId}, #{yddw}, #{ydwz}, #{ydArea}, #{ydUnit}, #{tdyt}, #{tdhqfs}, #{pzydjg}, #{pzydwh},
-                #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, false, #{creatorId}, now(), now(), #{sourceId})
+                #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, #{bz}, false, #{creatorId}, now(), now(), #{sourceId})
     </insert>
 
     <!-- 根据项目ID获取记录 -->
@@ -82,6 +83,7 @@
             <if test="zsbh != null">zsbh = #{zsbh},</if>
             <if test="fzjg != null">fzjg = #{fzjg},</if>
             <if test="fzDate != null">fz_date = #{fzDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

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

@@ -23,6 +23,7 @@
         <result property="updatedAt" column="updated_at"/>
         <result property="gdUnit" column="gd_unit"/>
         <result property="nf" column="nf"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -35,11 +36,11 @@
     <insert id="add" parameterType="com.siwei.apply.domain.Tdgy">
         INSERT INTO t_tdgy (id, project_id, srf, tdyt, jswz,
                             gd_area, gd_type, has_zz, hbcrfapfwh, hbcrhtbh,
-                            hbcrht_date, gd_unit, has_onchain, creator_id,
+                            hbcrht_date, gd_unit, bz, has_onchain, creator_id,
                             created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{srf}, #{tdyt}, #{jswz},
                 #{gdArea}, #{gdType}, #{hasZz}, #{hbcrfapfwh}, #{hbcrhtbh},
-                #{hbcrhtDate}, #{gdUnit}, false, #{creatorId},
+                #{hbcrhtDate}, #{gdUnit}, #{bz}, false, #{creatorId},
                 now(), now())
     </insert>
 
@@ -73,6 +74,7 @@
             <if test="hbcrhtDate != null">hbcrht_date = #{hbcrhtDate},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="gdUnit != null">gd_unit = #{gdUnit},</if>
+            <if test="bz != null">bz = #{bz},</if>
             updated_at = now()
         </set>
         WHERE id = #{id}

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

@@ -20,6 +20,7 @@
         <result property="updatedAt" column="updated_at"/>
         <result property="hyyj" column="hyyj"/>
         <result property="sourceId" column="source_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -32,11 +33,11 @@
     <insert id="add" parameterType="com.siwei.apply.domain.Tdhyhs">
         INSERT INTO t_tdhyhs (id, project_id, ydwz, hgzh, fzjg, fz_date,
                                jsdw, gljsgcghxkh,hyyj,
-                               has_onchain, creator_id,
+                               bz, has_onchain, creator_id,
                                created_at, updated_at, source_id)
         VALUES (#{id}, #{projectId}, #{ydwz}, #{hgzh}, #{fzjg}, #{fzDate},
                 #{jsdw}, #{gljsgcghxkh},#{hyyj},
-                false, #{creatorId},
+                #{bz}, false, #{creatorId},
                 now(), now(), #{sourceId})
     </insert>
 
@@ -67,6 +68,7 @@
             <if test="jsdw != null">jsdw = #{jsdw},</if>
             <if test="gljsgcghxkh != null">gljsgcghxkh = #{gljsgcghxkh},</if>
             <if test="hyyj != null">hyyj = #{hyyj},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             <if test="sourceId != null">source_id = #{sourceId},</if>
             updated_at = now()

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

@@ -21,6 +21,7 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="hasOnchain" column="has_onchain"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <select id="isExit" resultType="Boolean">
@@ -32,9 +33,9 @@
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Tjyydhx">
         INSERT INTO t_tjyydhx (id, project_id, dkbm, area, area_unit, ydxz, ydwz,
-        cjbh, cj_date, cjyj, creator_id, has_onchain, created_at, updated_at)
+        cjbh, cj_date, cjyj, bz, creator_id, has_onchain, created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{dkbm}, #{area}, #{areaUnit}, #{ydxz}, #{ydwz},
-        #{cjbh}, #{cjDate}, #{cjyj}, #{creatorId},false, now(), now())
+        #{cjbh}, #{cjDate}, #{cjyj}, #{bz}, #{creatorId},false, now(), now())
     </insert>
 
     <!-- 根据项目ID获取记录 -->
@@ -65,6 +66,7 @@
             <if test="cjbh != null">cjbh = #{cjbh},</if>
             <if test="cjDate != null">cj_date = #{cjDate},</if>
             <if test="cjyj != null">cjyj = #{cjyj},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>

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

@@ -20,21 +20,22 @@
         <result property="updatedAt" column="updated_at"/>
         <result property="batchType" column="batch_type"/>
         <result property="projectPropertyId" column="project_property_id"/>
+        <result property="bz" column="bz"/>
     </resultMap>
     <insert id="add" parameterType="com.siwei.apply.domain.YdbpData">
         INSERT INTO t_ydbp_data (
-            id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at
+            id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, bz, creator_id, created_at, updated_at
         ) VALUES (
-            #{id}, #{name}, #{ydArea}, #{ydUnit}, #{zsArea}, #{zsUnit}, #{hasZz}, #{bpDate}, #{pfwh}, #{pfDate}, #{creatorId}, now(), now()
+            #{id}, #{name}, #{ydArea}, #{ydUnit}, #{zsArea}, #{zsUnit}, #{hasZz}, #{bpDate}, #{pfwh}, #{pfDate}, #{bz}, #{creatorId}, now(), now()
         )
     </insert>
     <select id="getById" parameterType="string" resultMap="YdbpDataResultMap">
-        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at,has_onchain
+        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, bz, creator_id, created_at, updated_at,has_onchain
         FROM t_ydbp_data
         WHERE id = #{id}
     </select>
     <select id="selectPage" resultMap="YdbpDataResultMap">
-        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, creator_id, created_at, updated_at
+        SELECT id, name, yd_area, yd_unit, zs_area, zs_unit, has_zz, bp_date, pfwh, pf_date, bz, creator_id, created_at, updated_at
         FROM t_ydbp_data
         where 1=1
         <if test="name != null and name != ''">
@@ -70,6 +71,7 @@
             <if test="bpDate != null">bp_date = #{bpDate},</if>
             <if test="pfwh != null">pfwh = #{pfwh},</if>
             <if test="pfDate != null">pf_date = #{pfDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             updated_at = #{updatedAt}
         </set>
         WHERE id = #{id}

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

@@ -20,6 +20,7 @@
         <result property="creatorId" column="creator_id"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
+        <result property="bz" column="bz"/>
     </resultMap>
     <select id="isExit" resultType="Boolean">
         SELECT COUNT(1) > 0
@@ -29,9 +30,9 @@
     <!-- 插入语句 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Ydbp">
         INSERT INTO t_ydbp (id, project_id, tdyt, yd_area, yd_unit, zs_area, zs_unit, has_zz,
-                            bp_date, pfwh, pf_date, has_onchain, creator_id, created_at, updated_at)
+                            bp_date, pfwh, pf_date, bz, has_onchain, creator_id, created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{tdyt}, #{ydArea}, #{ydUnit}, #{zsArea}, #{zsUnit}, #{hasZz},
-                #{bpDate}, #{pfwh}, #{pfDate}, false, #{creatorId}, now(), now())
+                #{bpDate}, #{pfwh}, #{pfDate}, #{bz}, false, #{creatorId}, now(), now())
     </insert>
 
     <!-- 查询语句 -->
@@ -198,6 +199,7 @@
             <if test="bpDate != null">bp_date = #{bpDate},</if>
             <if test="pfwh != null">pfwh = #{pfwh},</if>
             <if test="pfDate != null">pf_date = #{pfDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>

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

@@ -18,6 +18,8 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
         <result property="creatorId" column="creator_id"/>
+        <result property="bz" column="bz"/>
+
     </resultMap>
     <!-- attachment 字段已被数据库删除，移除相关映射 -->
     <select id="isExit" resultType="Boolean">
@@ -28,9 +30,9 @@
 
     <insert id="add" parameterType="com.siwei.apply.domain.Ydysyxz">
         INSERT INTO t_ydysyxz (id, project_id, jsyj, jsdd, area, area_unit, has_zz,
-                               xmjsyj, zzwh, fz_date, has_onchain, created_at, updated_at, creator_id)
+                               xmjsyj, zzwh, fz_date, bz, has_onchain, created_at, updated_at, creator_id)
         VALUES (#{id}, #{projectId}, #{jsyj}, #{jsdd}, #{area}, #{areaUnit}, #{hasZz},
-                #{xmjsyj}, #{zzwh}, #{fzDate},
+                #{xmjsyj}, #{zzwh}, #{fzDate}, #{bz},
                 false, now(), now(), #{creatorId})
     </insert>
     <select id="get" resultMap="resMap">
@@ -58,6 +60,7 @@
             <if test="xmjsyj != null">xmjsyj = #{xmjsyj},</if>
             <if test="zzwh != null">zzwh = #{zzwh},</if>
             <if test="fzDate != null">fz_date = #{fzDate},</if>
+            <if test="bz != null">bz = #{bz},</if>
             <if test="hasOnchain != null">has_onchain = #{hasOnchain},</if>
             updated_at = now()
         </set>