Commit 43eecefd authored by mengbali153's avatar mengbali153

能力管理--联调

历史档案--联调
非标产值--联调
parent 8dfe5395
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
na.reported_hours as 上报工时, na.reported_hours as 上报工时,
( (
CASE na.status CASE na.status
WHEN 0 THEN '未申请' WHEN 0 THEN '未提交'
WHEN 1 THEN '已通过' WHEN 1 THEN '待审批'
WHEN 2 THEN '未通过' WHEN 3 THEN '未通过'
ELSE NULL ELSE '已通过'
END END
)as 状态, )as 状态,
na.final_value as 最终产值, na.final_value as 最终产值,
......
...@@ -97,8 +97,10 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro ...@@ -97,8 +97,10 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
nonStandardApprovalMapper.updateById(nonStandardApproval); nonStandardApprovalMapper.updateById(nonStandardApproval);
String result = ""; String result = "";
if(nonStandardApproval.getStatus() == 1){ if(nonStandardApproval.getStatus() == 1){
result = "已通过"; result = "待审批";
}else if(nonStandardApproval.getStatus() == 2){ }else if(nonStandardApproval.getStatus() == 2){
result = "已通过";
}else if(nonStandardApproval.getStatus() == 3){
result = "未通过"; result = "未通过";
}else{ }else{
result = "未提交"; result = "未提交";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment