建设用地规划许可添加上面积

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

@@ -32,6 +32,7 @@ public class Jsydghxk {
     private Date createdAt;            // 创建时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updatedAt;            // 更新时间
+    private String ydUnit;             // 用地面积单位（对应列：yd_unit）
 
     public void generateId() {
         this.id = UUID.randomUUID().toString();

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

@@ -11,6 +11,7 @@ public class JsydghxkVo {
     private String yddw;               // 用地单位
     private String ydwz;               // 用地位置
     private Float ydArea;              // 用地面积
+    private String ydUnit;             // 用地面积单位
     private String tdyt;               // 土地用途
     private String tdhqfs;             // 土地获取方式
     private String pzydjg;             // 批准用地机关

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

@@ -56,10 +56,10 @@ public class YdbpImpl implements YdbpService {
         Integer projectType = projectMapper.getProjectTypeById(ydbp.getProjectId());
         /*2.获取当前位置工作流*/
         Workflow workflow = workflowMapper.selectByProjectTypeAndTableName(projectType, "t_ydbp");
-        /*3.获取上一个工作流*/
+        /*3.获取上一个流程工作流*/
         Workflow workflowPrev = workflowMapper.selectPrevByProjectTypeAndTableName(projectType, "t_ydbp");
         /*4.获取上一个工作流的节点信息*/
-        List<ProjectWorkflow> projectWorkflows = projectWorkflowMapper.selectByProjectIdAndNodeTableName(ydbp.getProjectId(), workflow.getTableName());
+        List<ProjectWorkflow> projectWorkflows = projectWorkflowMapper.selectByProjectIdAndNodeTableName(ydbp.getProjectId(), workflowPrev.getTableName());
         String parentId = "";
         if (projectWorkflows != null && !projectWorkflows.isEmpty()) {
             // TODO: 如果有多个上一个工作流节点，应该如何处理？目前取第一个

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

@@ -11,6 +11,8 @@
         <result property="yddw" column="yddw"/>
         <result property="ydwz" column="ydwz"/>
         <result property="ydArea" column="yd_area"/>
+        <!-- 新增：用地面积单位 -->
+        <result property="ydUnit" column="yd_unit"/>
         <result property="tdyt" column="tdyt"/>
         <result property="tdhqfs" column="tdhqfs"/>
         <result property="pzydjg" column="pzydjg"/>
@@ -33,9 +35,9 @@
 
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Jsydghxk">
-        INSERT INTO t_jsydghxk (id, project_id, yddw, ydwz, yd_area, tdyt, tdhqfs, pzydjg, pzydwh,
+        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)
-        VALUES (#{id}, #{projectId}, #{yddw}, #{ydwz}, #{ydArea}, #{tdyt}, #{tdhqfs}, #{pzydjg}, #{pzydwh},
+        VALUES (#{id}, #{projectId}, #{yddw}, #{ydwz}, #{ydArea}, #{ydUnit}, #{tdyt}, #{tdhqfs}, #{pzydjg}, #{pzydwh},
                 #{jsgm}, #{zsbh}, #{fzjg}, #{fzDate}, false, #{creatorId}, now(), now())
     </insert>
 
@@ -54,6 +56,7 @@
             <if test="yddw != null">yddw = #{yddw},</if>
             <if test="ydwz != null">ydwz = #{ydwz},</if>
             <if test="ydArea != null">yd_area = #{ydArea},</if>
+            <if test="ydUnit != null">yd_unit = #{ydUnit},</if>
             <if test="tdyt != null">tdyt = #{tdyt},</if>
             <if test="tdhqfs != null">tdhqfs = #{tdhqfs},</if>
             <if test="pzydjg != null">pzydjg = #{pzydjg},</if>