diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java index b4b2fd57f..b59051962 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -16,6 +16,7 @@ public class IndicatorsVO extends IndicatorsEntity { private String classifyName; private String createDeptName; + private String indicatorsStatusName; private Long parentClassifyId; 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 f2fb2742e..f251a6a0c 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 @@ -57,7 +57,10 @@ and si.id = #{id} SELECT si.*, - sc.NAME AS classifyName + sc.NAME AS classifyName, + case indicators_status + WHEN 1 then '已提交' + WHEN 2 then '已确认' + END AS indicatorsStatusName FROM sup_indicators AS si LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id AND sc.is_deleted = 0 diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index c881f5ae5..09afaed50 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -447,11 +447,11 @@ public class ClassifyServiceImpl extends BaseServiceImpl