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
a70c8888
Commit
a70c8888
authored
5 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新建合同校验在执行中合同
parent
b85d4d23
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
1 deletion
+27
-1
Contract.java
src/main/java/common/model/Contract.java
+12
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+10
-1
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+5
-0
No files found.
src/main/java/common/model/Contract.java
View file @
a70c8888
...
@@ -64,6 +64,8 @@ public class Contract {
...
@@ -64,6 +64,8 @@ public class Contract {
private
Long
intervaIncomeShare
;
//区间分摊收入(*100的结果)
private
Long
intervaIncomeShare
;
//区间分摊收入(*100的结果)
private
Long
incomeShareAll
;
//分摊总收入(*100的结果)
private
Long
incomeShareAll
;
//分摊总收入(*100的结果)
private
Integer
shareSign
;
//标记是否计算分摊收入 1 计算 0 不计算
private
String
searchName
;
private
String
searchName
;
private
List
<
String
>
customBodyNames
;
private
List
<
String
>
customBodyNames
;
...
@@ -551,4 +553,14 @@ public class Contract {
...
@@ -551,4 +553,14 @@ public class Contract {
public
void
setCustomBodyNames
(
List
<
String
>
customBodyNames
)
{
public
void
setCustomBodyNames
(
List
<
String
>
customBodyNames
)
{
this
.
customBodyNames
=
customBodyNames
;
this
.
customBodyNames
=
customBodyNames
;
}
}
public
Integer
getShareSign
()
{
return
shareSign
;
}
public
void
setShareSign
(
Integer
shareSign
)
{
this
.
shareSign
=
shareSign
;
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
a70c8888
...
@@ -468,11 +468,20 @@ public class ContractServiceImpl implements ContractService {
...
@@ -468,11 +468,20 @@ public class ContractServiceImpl implements ContractService {
// 合同编号已存在
// 合同编号已存在
contractExist
.
setId
(-
100L
);
contractExist
.
setId
(-
100L
);
contractExist
.
setErroMessage
(
"合同编号已存在"
);
contractExist
.
setErroMessage
(
"合同编号已存在"
);
return
contractExist
;
return
contractExist
;
}
}
}
}
List
<
String
>
codes
=
contractRepository
.
findContractBodyNames
(
resource
.
getCustomerBody
(),
resource
.
getContractCode
());
if
(!
codes
.
isEmpty
())
{
// 合同编号已存在
resource
.
setId
(-
200L
);
resource
.
setErroMessage
(
"当前"
+
resource
.
getCustomerBody
()
+
"仍有其他正在执行的合同"
+
String
.
join
(
",\n"
,
codes
));
return
resource
;
}
resource
.
setInvoice
(
0L
);
resource
.
setInvoice
(
0L
);
Long
extraFlow
=
resource
.
getExtraFlow
();
Long
extraFlow
=
resource
.
getExtraFlow
();
if
(
extraFlow
==
null
)
{
if
(
extraFlow
==
null
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
a70c8888
...
@@ -95,6 +95,11 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
...
@@ -95,6 +95,11 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
for
(
Contract
contract
:
contracts
)
{
for
(
Contract
contract
:
contracts
)
{
if
(
contract
.
getShareSign
()
!=
null
&&
contract
.
getShareSign
().
intValue
()
==
0
)
{
//不参与分摊计算
continue
;
}
// this.caculateShareIncome(contract, start, end);
// this.caculateShareIncome(contract, start, end);
this
.
shareIncome4Contract
(
contract
,
start
,
end
);
this
.
shareIncome4Contract
(
contract
,
start
,
end
);
contract
.
setMyBodyName
(
bodiesNameMap
.
get
(
contract
.
getMyBodyCode
()));
contract
.
setMyBodyName
(
bodiesNameMap
.
get
(
contract
.
getMyBodyCode
()));
...
...
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