Merge branch 'dev' into pre-production

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;
 

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

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()){
+		if (Func.isNotEmpty(instanceofDTO.getIsCommit())){
-			indicatorsEntity.setIndicatorsStatus(2);
+			if (1 == instanceofDTO.getIsCommit()){
-
+				indicatorsEntity.setIndicatorsStatus(2);
+			}
 		}
-
 		return R.status(iIndicatorsService.updateById(indicatorsEntity));
 	}