Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
竹天卫
tianjin-cement
Commits
43eecefd
Commit
43eecefd
authored
Oct 06, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
能力管理--联调
历史档案--联调 非标产值--联调
parent
8dfe5395
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
NonStandardApprovalMapper.xml
.../cement/business/mapper/xml/NonStandardApprovalMapper.xml
+4
-4
NonStandardApprovalServiceImpl.java
...business/service/impl/NonStandardApprovalServiceImpl.java
+3
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApprovalMapper.xml
View file @
43eecefd
...
...
@@ -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
View file @
43eecefd
...
...
@@ -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
=
"未提交"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment