From 78f8d10225c909db592df12f4a2dc4e4d7678c53 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 24 Feb 2024 22:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E5=88=97=E8=A1=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/supervise/vo/IndicatorsVO.java     |  1 +
 .../com/logpm/supervise/mapper/IndicatorsMapper.xml   | 11 +++++++++--
 .../supervise/service/impl/ClassifyServiceImpl.java   |  8 ++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

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>
     <select id="selectMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
-        SELECT si.*,sc.name AS classifyName FROM sup_indicators AS  si LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
+        case indicators_status
+        WHEN 1 then '已提交'
+        WHEN 2 then '已确认'
+        END AS indicatorsStatusName
          WHERE si.is_deleted = 0 and si.create_user = #{params.userId} AND sc.is_deleted = 0
         <if test="params.assessDept != null and params.assessDept != ''" >
             and si.assess_dept = #{params.assessDept}
@@ -72,7 +75,11 @@
     <select id="selectBeMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
         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<ClassifyMapper, Classif
 		if (Func.isNotEmpty(instanceofDTO.getAppealReason())){
 			indicatorsEntity.setIsObjection(1);
 		}
-		if (1 ==instanceofDTO.getIsCommit()){
-			indicatorsEntity.setIndicatorsStatus(2);
-
+		if (Func.isNotEmpty(instanceofDTO.getIsCommit())){
+			if (1 == instanceofDTO.getIsCommit()){
+				indicatorsEntity.setIndicatorsStatus(2);
+			}
 		}
-
 		return R.status(iIndicatorsService.updateById(indicatorsEntity));
 	}