From 86fa44b96410bdef9a30d9769139fbf867d83626 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Wed, 12 Mar 2025 01:23:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java   | 2 ++
 shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java
index b45c9c9d..a5bc0608 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java
@@ -22,4 +22,6 @@ public class DfYhApproveDto extends DfV2CheckingDto {
     private String recordId;
     @ApiModelProperty("问题id")
     private String problemId;
+    @ApiModelProperty("状态")
+    private String status;
 }
diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
index b5419f3e..70822330 100644
--- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
+++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
@@ -14,6 +14,7 @@
         <association property="detail" javaType="com.kms.yxgh.df.dto.v2.DfYhApproveDto">
             <id property="id" column="jl_id"/>
             <result property="name" column="name"/>
+            <result property="status" column="yh_status"/>
             <result property="dikeCode" column="dike_code"/>
             <result property="dikeName" column="dike_name"/>
             <result property="type" column="type"/>
@@ -30,7 +31,7 @@
         SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status status,
         ts.operator operator, ts.comment comment, ts.doc ts_doc,
         jl.id , jl.name ,jl.dike_code , jl.dike_name , jl.type type, jl.category ,
-        jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id
+        jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status
         FROM bs_sgc_sp_task ts
         LEFT JOIN bs_sgc_df_xcyj jl ON jl.id = ts.form_id
         WHERE