Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

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;
 }

shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java

@@ -145,6 +145,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
         } else {
             BeanUtils.copyProperties(dfYh, dfYhV2);
             dfYhV2.setDoc(getDocStrJson(dfYh.getDoc()));
+            dfYhV2.setStatus(DfYhV2StatusEnum.UNDER_MAINTENANCE.getValue());
             saveOrUpdate(dfYhV2);
             BeanUtils.copyProperties(dfYhV2, dto);
             return dto;

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