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
5d3ef5dd
Commit
5d3ef5dd
authored
May 12, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
3cd43677
34a8b4d9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
23 deletions
+27
-23
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+2
-2
TInsuranceWarnServiceImpl.java
...ces/service/insurance/impl/TInsuranceWarnServiceImpl.java
+2
-2
TSocialInfoServiceImpl.java
...s/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
+11
-7
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+12
-12
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
5d3ef5dd
...
@@ -184,9 +184,9 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
...
@@ -184,9 +184,9 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelProperty
(
"档案柜号"
)
@ExcelProperty
(
"档案柜号"
)
private
String
fileCabinetNo
;
private
String
fileCabinetNo
;
/**
/**
* 离职日期
* 离职日期
fxj 2025-05-08 优化线上邮件报错 isDate = true
*/
*/
@ExcelAttribute
(
name
=
"离职日期"
)
@ExcelAttribute
(
name
=
"离职日期"
,
isDate
=
true
)
@Schema
(
description
=
"离职日期"
)
@Schema
(
description
=
"离职日期"
)
@ExcelProperty
(
"离职日期"
)
@ExcelProperty
(
"离职日期"
)
private
String
leaveDate
;
private
String
leaveDate
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceWarnServiceImpl.java
View file @
5d3ef5dd
...
@@ -384,7 +384,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
...
@@ -384,7 +384,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
if
(
Common
.
isEmpty
(
content
)){
if
(
Common
.
isEmpty
(
content
)){
content
=
new
StringBuilder
();
content
=
new
StringBuilder
();
content
.
append
(
String
.
format
(
"项目数:%d、商险临期人数:%d、商险过期人数:%d,<br/>"
,
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,
...
@@ -436,7 +436,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
RestTemplate
restTemplate
=
new
RestTemplate
();
RestTemplate
restTemplate
=
new
RestTemplate
();
Map
<
String
,
Object
>
requestMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
requestMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
textcard
=
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"
));
textcard
.
put
(
"url"
,
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
(),
wxConfig
.
getDomainName
()
+
"/auth/oauth/wxLogin"
,
"66"
));
content
.
append
(
"请及时至HRO系统进行处理,以免人员脱保!"
);
content
.
append
(
"请及时至HRO系统进行处理,以免人员脱保!"
);
textcard
.
put
(
"description"
,
content
.
toString
());
textcard
.
put
(
"description"
,
content
.
toString
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
View file @
5d3ef5dd
...
@@ -652,14 +652,14 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -652,14 +652,14 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
&&
Common
.
isNotNull
(
socialInfo
.
getYsdHandleStatus
())
&&
Common
.
isNotNull
(
socialInfo
.
getYsdHandleStatus
())
&&
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
()))
{
&&
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
()))
{
// 医生大状态为待办理或派减待办理
// 医生大状态为待办理或派减待办理
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
get
Pension
Handle
())
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
get
Medical
Handle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
get
Pension
Handle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
get
Medical
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
get
WorkInjury
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
get
Birth
Handle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
get
WorkInjury
Handle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
get
Birth
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
get
Unemploy
Handle
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
get
Bigailment
Handle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
get
Unemploy
Handle
()))
{
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
get
Bigailment
Handle
()))
{
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
ONE_STRING
);
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
ONE_STRING
);
handleRemark
+=
"医疗、生育、大病手动转自动化"
;
handleRemark
+=
"医疗、生育、大病手动转自动化"
;
canUpdate
=
true
;
canUpdate
=
true
;
...
@@ -695,7 +695,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -695,7 +695,11 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
,
CommonConstants
.
ONE_STRING
);
,
CommonConstants
.
ONE_STRING
);
return
R
.
ok
(
"成功"
);
return
R
.
ok
(
"成功"
);
}
else
{
}
else
{
return
R
.
failed
(
"状态未变更,请刷新后查看列表状态!"
);
if
(
Common
.
isNotNull
(
handleRemark
)
&&
handleRemark
.
length
()
>
2
)
{
return
R
.
failed
(
"【"
+
handleRemark
+
"】状态未变更,请刷新后查看列表状态!"
);
}
else
{
return
R
.
failed
(
"状态未变更,请刷新后查看列表状态!"
);
}
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
5d3ef5dd
...
@@ -1414,12 +1414,12 @@
...
@@ -1414,12 +1414,12 @@
a.FIRST_PAY_TIME,
a.FIRST_PAY_TIME,
a.GRADUATION_TIME,
a.GRADUATION_TIME,
IF(a.LEAVE_DATE is not null,DATE_FORMAT(a.LEAVE_DATE,"%Y-%m-%d"),"") as "LEAVE_DATE"
IF(a.LEAVE_DATE is not null,DATE_FORMAT(a.LEAVE_DATE,"%Y-%m-%d"),"") as "LEAVE_DATE"
,if(a.type ='
1
', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status
,if(a.type ='
0' and s.add_ygs_Handle_Status != '0
', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status
,if(a.type ='
1
', s.add_ysd_Handle_Status, s.ysd_Handle_Status) ysd_Handle_Status
,if(a.type ='
0' and s.add_ysd_Handle_Status != '0
', s.add_ysd_Handle_Status, s.ysd_Handle_Status) ysd_Handle_Status
,if(a.type ='
1
', s.add_YGS_REMARK, s.YGS_REMARK) YGS_REMARK
,if(a.type ='
0' and s.add_ygs_Handle_Status != '0
', s.add_YGS_REMARK, s.YGS_REMARK) YGS_REMARK
,if(a.type ='
1
', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='
0' and s.add_ysd_Handle_Status != '0
', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='
1
', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='
0' and s.add_ygs_Handle_Status != '0
', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='
1
', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='
0' and s.add_ysd_Handle_Status != '0
', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
FROM t_dispatch_info a
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
@@ -1665,12 +1665,12 @@
...
@@ -1665,12 +1665,12 @@
a.GRADUATION_TIME,a.AUTO_FLAG
a.GRADUATION_TIME,a.AUTO_FLAG
,a.SOCIAL_HOUSEHOLD_NAME
,a.SOCIAL_HOUSEHOLD_NAME
,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,if(a.type ='
1
', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status
,if(a.type ='
0' and s.add_ygs_Handle_Status != '0
', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status
,if(a.type ='
1
', s.add_ysd_Handle_Status, s.ysd_Handle_Status) ysd_Handle_Status
,if(a.type ='
0' and s.add_ysd_Handle_Status != '0
', s.add_ysd_Handle_Status, s.ysd_Handle_Status) ysd_Handle_Status
,if(a.type ='
1
', s.add_YGS_REMARK, s.YGS_REMARK) YGS_REMARK
,if(a.type ='
0' and s.add_ygs_Handle_Status != '0
', s.add_YGS_REMARK, s.YGS_REMARK) YGS_REMARK
,if(a.type ='
1
', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='
0' and s.add_ysd_Handle_Status != '0
', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='
1
', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='
0' and s.add_ygs_Handle_Status != '0
', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='
1
', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='
0' and s.add_ysd_Handle_Status != '0
', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
FROM t_dispatch_info a
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
...
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