diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java index e4428b618..47914314f 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java @@ -41,4 +41,8 @@ public class ExportIndicatorsVO implements Serializable { private String assessDeptName; @ExcelProperty(value = "考核人") private String assessUserName; + @ExcelProperty(value = "整改结果") + private String objectionRemark; + @ExcelProperty(value = "整改反馈") + private String appealReason; } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml index b3d928ccc..416ba64df 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml @@ -109,7 +109,9 @@ si.assess_user_name assessUserName, si.point point, si.create_time createTime, - si.create_user createUser + si.create_user createUser, + si.objection_remark objectionRemark, + si.appeal_reason appealReason from sup_indicators si left join sup_classify sc on sc.id = si.classify_id left join sup_classify psc on psc.id = sc.p_id