Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
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
reyun
manager
Commits
6dd69e5e
Commit
6dd69e5e
authored
6 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
操作日志
parent
137d04ce
master
…
0727_bugfix
1082_bugfix
1151_bugfix
1209_bugfix
1315_bugfix
1439_bugfix
1608_bugfix
1608_from_1619
1619_bugfix
1990_bugfix
2578_bugfix
2580_fix
31969_bugfix
32400_fix
32599_bugfix
649_bugfix
bigfix_20201028
bugfix_1608_new
bugfix_1760
bugfix_master_1760
change_double
develper
liushaowei
master_mv
mobvista_master
month_flow
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+2
-0
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
6dd69e5e
...
@@ -1164,11 +1164,13 @@ public class ContractServiceImpl implements ContractService {
...
@@ -1164,11 +1164,13 @@ public class ContractServiceImpl implements ContractService {
if
(
ContractStatusEnum
.
CANCEL
.
getKey
().
equals
(
status
))
{
if
(
ContractStatusEnum
.
CANCEL
.
getKey
().
equals
(
status
))
{
contract
.
setStatus
(
status
);
contract
.
setStatus
(
status
);
changeDelInfo
.
setDetail
(
"废弃合同"
);
changeDelInfo
.
setDetail
(
"废弃合同"
);
changeDelInfo
.
setSourceId
(
contract
.
getId
());
this
.
saveChangeDelInfo
(
changeDelInfo
,
4
,
2
,
ip
,
loginUser
);
// type 2 修改
this
.
saveChangeDelInfo
(
changeDelInfo
,
4
,
2
,
ip
,
loginUser
);
// type 2 修改
}
else
{
}
else
{
changeDelInfo
.
setDetail
(
"删除合同"
);
changeDelInfo
.
setDetail
(
"删除合同"
);
changeDelInfo
.
setOriginal
(
contract
.
getStatus
());
changeDelInfo
.
setOriginal
(
contract
.
getStatus
());
changeDelInfo
.
setSourceId
(
contract
.
getId
());
this
.
saveChangeDelInfo
(
changeDelInfo
,
4
,
1
,
ip
,
loginUser
);
this
.
saveChangeDelInfo
(
changeDelInfo
,
4
,
1
,
ip
,
loginUser
);
contract
.
setStatus
(
ContractStatusEnum
.
DELETE
.
getKey
());
contract
.
setStatus
(
ContractStatusEnum
.
DELETE
.
getKey
());
...
...
This diff is collapsed.
Click to expand it.
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