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
6ca99cf9
Commit
6ca99cf9
authored
May 09, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
4a8645af
f45390f8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+2
-2
EkpSocialInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
+1
-1
TInsuranceWarnServiceImpl.java
...ces/service/insurance/impl/TInsuranceWarnServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
6ca99cf9
...
...
@@ -184,9 +184,9 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelProperty
(
"档案柜号"
)
private
String
fileCabinetNo
;
/**
* 离职日期
* 离职日期
fxj 2025-05-08 优化线上邮件报错 isDate = true
*/
@ExcelAttribute
(
name
=
"离职日期"
)
@ExcelAttribute
(
name
=
"离职日期"
,
isDate
=
true
)
@Schema
(
description
=
"离职日期"
)
@ExcelProperty
(
"离职日期"
)
private
String
leaveDate
;
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
View file @
6ca99cf9
...
...
@@ -116,7 +116,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
EkpSocialInfo
socialCount
;
//获取社保订单明细合计
EkpSocialSumInfoVo
socialSumInfo
=
baseMapper
.
getCostSumInfo
(
idCard
,
month
);
EkpSocialSumInfoVo
socialSumInfo
=
baseMapper
.
getCostSumInfo
(
idCard
,
dateStringInsert
(
month
)
);
//预估单位合计
BigDecimal
ygDwSum
=
Common
.
isEmpty
(
socialSumInfo
)
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialSumInfo
.
getYgDwSum
());
//实缴单位合计
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceWarnServiceImpl.java
View file @
6ca99cf9
...
...
@@ -384,7 +384,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
if
(
Common
.
isEmpty
(
content
)){
content
=
new
StringBuilder
();
content
.
append
(
String
.
format
(
"项目数:%d、商险临期人数:%d、商险过期人数:%d,<br/>"
,
temp
.
getDomainNum
(),
temp
.
get
GqNum
(),
temp
.
getL
qNum
()));
pushMap
.
put
(
user
.
getWxMessage
(),
content
);
temp
.
getDomainNum
(),
temp
.
get
LqNum
(),
temp
.
getG
qNum
()));
pushMap
.
put
(
user
.
getWxMessage
(),
content
);
}
}
}
...
...
@@ -436,7 +436,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
RestTemplate
restTemplate
=
new
RestTemplate
();
Map
<
String
,
Object
>
requestMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
textcard
=
new
HashMap
<>();
textcard
.
put
(
"title"
,
"
<b>商险待办提醒</b>
"
);
textcard
.
put
(
"title"
,
"
商险待办提醒
"
);
textcard
.
put
(
"url"
,
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
wxConfig
.
getDomainName
()
+
"/auth/oauth/wxLogin"
,
"66"
));
content
.
append
(
"请及时至HRO系统进行处理,以免人员脱保!"
);
textcard
.
put
(
"description"
,
content
.
toString
());
...
...
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