Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
4bddd503
Commit
4bddd503
authored
Apr 10, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9
parents
dc1e071c
6b8a4648
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
15 deletions
+44
-15
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+5
-3
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+18
-0
TEmployeeInsurancePreService.java
...ances/service/insurance/TEmployeeInsurancePreService.java
+7
-0
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+12
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+2
-12
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
4bddd503
...
...
@@ -187,8 +187,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
oldInsurance
=
oldMap
.
get
(
newInsurance
.
getId
());
if
(
oldInsurance
!=
null
)
{
differenceInsuranceKey
=
HrEquator
.
comparisonValue
(
oldInsurance
,
newInsurance
);
}
else
{
saveOrUpdateList
.
add
(
newInsurance
);
}
if
(
Common
.
isNotNull
(
differenceInsuranceKey
)
||
oldInsurance
==
null
)
{
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
...
...
@@ -199,7 +197,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailList
.
add
(
detailInsuranceLog
);
}
}
else
{
saveOrUpdateList
.
add
(
newInsurance
);
// 2:修改无老ID
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
CommonConstants
.
ONE_STRING
);
...
...
@@ -208,6 +205,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
saveOrUpdateList
.
add
(
newInsurance
);
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
// 3:删除
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
...
...
@@ -251,6 +249,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/saveOrUpdateInsuranceList"
,
saveOrUpdateList
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
else
{
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/deleteInsuranceByPreId"
,
empPreId
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
}
catch
(
Exception
e
)
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
4bddd503
...
...
@@ -213,10 +213,28 @@ public class TEmployeeInsurancePreController {
return
tEmployeeInsurancePreService
.
getListByEmpPreId
(
empPreId
);
}
/**
* @Description: 先删后增
* @Author: hgw
* @Date: 2025/4/10 14:49
* @return: java.lang.Boolean
**/
@Inner
@PostMapping
(
"/inner/saveOrUpdateInsuranceList"
)
public
Boolean
saveOrUpdateInsuranceList
(
@RequestBody
List
<
TEmployeeInsurancePre
>
preList
)
{
return
tEmployeeInsurancePreService
.
saveOrUpdateInsuranceList
(
preList
);
}
/**
* @Description: 清空
* @Author: hgw
* @Date: 2025/4/10 14:45
* @return: java.lang.Boolean
**/
@Inner
@PostMapping
(
"/inner/deleteInsuranceByPreId"
)
public
Boolean
deleteInsuranceByPreId
(
@RequestBody
String
preId
)
{
return
tEmployeeInsurancePreService
.
deleteInsuranceByPreId
(
preId
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TEmployeeInsurancePreService.java
View file @
4bddd503
...
...
@@ -92,5 +92,12 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
* @return: boolean
**/
boolean
saveOrUpdateInsuranceList
(
List
<
TEmployeeInsurancePre
>
preList
);
/**
* @Description: 清空
* @Author: hgw
* @Date: 2025/4/10 14:47
* @return: boolean
**/
boolean
deleteInsuranceByPreId
(
String
preId
);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
4bddd503
...
...
@@ -553,4 +553,16 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return
true
;
}
/**
* @Description: 删除
* @Author: hgw
* @Date: 2025/4/10 14:49
* @return: boolean
**/
@Override
public
boolean
deleteInsuranceByPreId
(
String
preId
)
{
baseMapper
.
deleteByEmpPreId
(
preId
);
return
true
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
4bddd503
...
...
@@ -8290,12 +8290,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Common
.
isNotNull
(
param
.
getAuthSql
())
&&
param
.
getAuthSql
().
contains
(
"1=2 CONCAT"
))
{
param
.
setAuthSql
(
param
.
getAuthSql
().
replace
(
"1=2 CONCAT"
,
"CONCAT"
));
}
IPage
<
InsuredListVo
>
insuranceList
=
baseMapper
.
replacePageToAutoSelect
(
page
,
param
);
// 购买月数
// if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
// insuranceList.getRecords().forEach(e -> e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString())));
// }
return
insuranceList
;
return
baseMapper
.
replacePageToAutoSelect
(
page
,
param
);
}
/**
...
...
@@ -8323,11 +8318,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
// 查保单未过期的数据
String
today
=
LocalDateUtil
.
getDateSrt
(
LocalDate
.
now
());
param
.
setPolicyEnd
(
today
);
IPage
<
InsuredListVo
>
insuranceList
=
baseMapper
.
policyPageToAutoSelect
(
page
,
param
);
// 购买月数
// if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
// insuranceList.getRecords().forEach(e -> e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString())));
// }
return
insuranceList
;
return
baseMapper
.
policyPageToAutoSelect
(
page
,
param
);
}
}
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