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
95fd187a
Commit
95fd187a
authored
Jul 27, 2021
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
81170a96
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+3
-2
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+15
-16
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
95fd187a
...
@@ -641,11 +641,12 @@ public class ContractServiceImpl implements ContractService {
...
@@ -641,11 +641,12 @@ public class ContractServiceImpl implements ContractService {
Contract
contract
=
contractRepository
.
findByCodePlatform
(
relationCode
,
platform
);
Contract
contract
=
contractRepository
.
findByCodePlatform
(
relationCode
,
platform
);
if
(
StringUtils
.
isEmpty
(
contract
.
getNextSignedDate
()))
{
if
(
StringUtils
.
isEmpty
(
contract
.
getNextSignedDate
()))
{
if
(
ContractStatusEnum
.
LATE
.
getKey
().
equals
(
resource
.
getStatus
()))
{
//如果晚录则设置绑定下一份合同的日期为签订月的最后一天
/*
if (ContractStatusEnum.LATE.getKey().equals(resource.getStatus())) {//如果晚录则设置绑定下一份合同的日期为签订月的最后一天
contract.setNextSignedDate(dateTime.dayOfMonth().withMaximumValue().toString("yyyy-MM-dd"));
contract.setNextSignedDate(dateTime.dayOfMonth().withMaximumValue().toString("yyyy-MM-dd"));
} else {
} else {
contract.setNextSignedDate(dateTime.plusDays(-1).toString("yyyy-MM-dd"));//签订日的前一天
contract.setNextSignedDate(dateTime.plusDays(-1).toString("yyyy-MM-dd"));//签订日的前一天
}
}*/
contract
.
setNextSignedDate
(
dateTime
.
plusDays
(-
1
).
toString
(
"yyyy-MM-dd"
));
//签订日的前一天
contract
.
setNextSignedContractCode
(
resource
.
getContractCode
());
contract
.
setNextSignedContractCode
(
resource
.
getContractCode
());
contractRepository
.
save
(
contract
);
contractRepository
.
save
(
contract
);
break
;
break
;
...
...
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
95fd187a
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