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 @@ + @@ -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