能力管理--联调

历史档案--联调
非标产值--联调

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApprovalMapper.xml

@@ -33,10 +33,10 @@
         na.reported_hours as 上报工时,
         (
         CASE na.status
-        WHEN 0 THEN '未申请'
-        WHEN 1 THEN '已通过'
-        WHEN 2 THEN '未通过'
-        ELSE NULL
+        WHEN 0 THEN '未提交'
+        WHEN 1 THEN '待审批'
+        WHEN 3 THEN '未通过'
+        ELSE '已通过'
         END
         )as 状态,
         na.final_value as 最终产值,

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java

@@ -97,8 +97,10 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
 		nonStandardApprovalMapper.updateById(nonStandardApproval);
 		String result = "";
 		if(nonStandardApproval.getStatus() == 1){
-			result = "已通过";
+			result = "待审批";
 		}else if(nonStandardApproval.getStatus() == 2){
+			result = "已通过";
+		}else if(nonStandardApproval.getStatus() == 3){
 			result = "未通过";
 		}else{
 			result = "未提交";