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
11866301
Commit
11866301
authored
6 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大后台
parent
568150e0
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
3 changed files
with
17 additions
and
21 deletions
+17
-21
ChangeDelInfoRepository.java
src/main/java/common/repository/ChangeDelInfoRepository.java
+1
-1
ContractRepository.java
src/main/java/common/repository/ContractRepository.java
+4
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+12
-20
No files found.
src/main/java/common/repository/ChangeDelInfoRepository.java
View file @
11866301
...
...
@@ -11,6 +11,6 @@ public interface ChangeDelInfoRepository extends JpaRepository<ChangeDelInfo, L
@Query
(
value
=
"select * from change_del_info where contract_code = ?1 order by ds desc"
,
nativeQuery
=
true
)
List
<
ChangeDelInfo
>
findByContract
(
String
contranctCode
);
@Query
(
value
=
"select * from change_del_info where ds >= ?1 and ds <= ?2 order by
ds
desc"
,
nativeQuery
=
true
)
@Query
(
value
=
"select * from change_del_info where ds >= ?1 and ds <= ?2 order by
creat_time
desc"
,
nativeQuery
=
true
)
List
<
ChangeDelInfo
>
findOnStartDate
(
String
startDate
,
String
endDate
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/repository/ContractRepository.java
View file @
11866301
...
...
@@ -72,4 +72,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query
(
value
=
"select contract_code from contract where my_body_code = ?1 order by code_num desc limit 1"
,
nativeQuery
=
true
)
String
findLastCode
(
String
code
);
@Query
(
value
=
"select * from contract where id = ?1 union all select * from contract where id = ?2"
,
nativeQuery
=
true
)
List
<
Contract
>
findByTwoIds
(
Long
relationContract
,
Long
relationContract1
);
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
11866301
...
...
@@ -659,8 +659,14 @@ public class ContractServiceImpl implements ContractService {
if
(
byfind
.
getTradeType
()
!=
resource
.
getTradeType
())
{
List
<
TradeType
>
types
=
tradeTypeRepsitory
.
findByTwoId
(
byfind
.
getTradeType
(),
resource
.
getTradeType
());
this
.
dealChangeInfoDetail
(
types
.
get
(
0
).
getName
(),
types
.
get
(
1
).
getName
(),
"行业分类"
,
"tradeType"
,
pid
,
delDetailsList
,
byfind
);
Map
<
String
,
String
>
dataDic
=
new
HashMap
();
for
(
TradeType
tradeType:
types
){
dataDic
.
put
(
tradeType
.
getId
().
toString
(),
tradeType
.
getName
());
}
String
nameFind
=
dataDic
.
get
(
byfind
.
getTradeType
()+
""
);
String
nameResource
=
dataDic
.
get
(
resource
.
getTradeType
()+
""
);
this
.
dealChangeInfoDetail
(
nameFind
==
null
?
"无"
:
nameFind
,
nameResource
==
null
?
"无"
:
nameResource
,
"行业分类"
,
"tradeType"
,
pid
,
delDetailsList
,
byfind
);
}
this
.
dealChangeInfoDetail
(
byfind
.
getStartDate
(),
resource
.
getStartDate
(),
...
...
@@ -687,28 +693,14 @@ public class ContractServiceImpl implements ContractService {
CONTRACT_TYPE
.
get
(
resource
.
getContractType
()),
"签约类型"
,
"startDate"
,
pid
,
delDetailsList
,
byfind
);
// if(byfind.getPriceLevel()!=null && !byfind.getPriceLevel().equals(resource.getPriceLevel())){
// List<PackageType> packageTypes = packageTypeRepository.findByTwoId(byfind.getPriceLevel(),resource.getPriceLevel());
// this.dealChangeInfoDetail(packageTypes.get(0).getPackageName(),packageTypes.get(1).getPackageName(),
// "套餐","priceLevel",pid,delDetailsList,byfind);
// }
// this.dealChangeInfoDetail(byfind.getMoney()==null?"":byfind.getMoney().toString(),
// resource.getMoney()==null?"":resource.getMoney().toString(),
// "合同金额","money",pid,delDetailsList,contractCode);
//
// this.dealChangeInfoDetail(byfind.getPayMoney()==null?"":byfind.getPayMoney().toString(),
// resource.getPayMoney()==null?"":resource.getPayMoney().toString(),
// "回款金额","payMoney",pid,delDetailsList,contractCode);
//
// this.dealChangeInfoDetail(byfind.getInvoiceMoney()==null?"":byfind.getInvoiceMoney().toString(),
// resource.getInvoiceMoney()==null?"":resource.getInvoiceMoney().toString(),
// "发票金额","invoiceMoney",pid,delDetailsList,contractCode);
this
.
dealChangeInfoDetail
(
byfind
.
getDiscountTimeLong
()==
null
?
""
:
byfind
.
getDiscountTimeLong
().
toString
(),
resource
.
getDiscountTimeLong
()==
null
?
""
:
resource
.
getDiscountTimeLong
().
toString
(),
"赠送时长"
,
"discountTimeLong"
,
pid
,
delDetailsList
,
byfind
);
this
.
dealChangeInfoDetail
(
byfind
.
getRelationCode
()==
null
?
"无"
:
byfind
.
getRelationCode
(),
resource
.
getRelationCode
()==
null
?
"无"
:
resource
.
getRelationCode
(),
"关联合同"
,
"relationCode"
,
pid
,
delDetailsList
,
byfind
);
return
delDetailsList
;
...
...
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