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
3a0d2593
Commit
3a0d2593
authored
May 14, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.11' into MVP1.7.11
parents
680f4f66
08be9794
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
160 additions
and
44 deletions
+160
-44
ProjectSetInfoVo.java
...yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
+7
-0
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+2
-1
TInsuranceWarnMapper.java
...fu/insurances/mapper/insurances/TInsuranceWarnMapper.java
+2
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+45
-0
TInsuranceWarnServiceImpl.java
...ces/service/insurance/impl/TInsuranceWarnServiceImpl.java
+56
-40
TInsuranceWarnMapper.xml
...main/resources/mapper/insurances/TInsuranceWarnMapper.xml
+11
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+37
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
View file @
3a0d2593
...
...
@@ -107,4 +107,11 @@ public class ProjectSetInfoVo implements Serializable {
@Schema
(
description
=
"是否BPO"
,
name
=
"bpoFlag"
)
@ExcelIgnore
private
String
bpoFlag
;
/**
* MVP1.7.11 增加: 服务项目
*/
@Schema
(
description
=
"服务项目"
,
name
=
"serverItem"
)
@ExcelIgnore
private
String
serverItem
;
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
3a0d2593
...
...
@@ -492,7 +492,8 @@
a.STOP_FLAG,
a.INVOICE_TITLE_SALARY,
a.INVOICE_TITLE_INSURANCE,
a.BPO_FLAG
a.BPO_FLAG,
a.SERVER_ITEM
FROM t_settle_domain a
where a.DELETE_FLAG = '0'
<if
test=
"codes != null and codes.size() > 0"
>
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceWarnMapper.java
View file @
3a0d2593
...
...
@@ -26,4 +26,6 @@ public interface TInsuranceWarnMapper extends BaseMapper<TInsuranceAlert> {
List
<
InsuranceAlertWx
>
getInsuranceAlertToWx
();
List
<
TInsuranceAlert
>
selectInsuranceAlertIgnore
();
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
3a0d2593
...
...
@@ -52,6 +52,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.MapUtils
;
import
org.apache.commons.lang.ArrayUtils
;
import
org.apache.commons.lang3.RandomStringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
...
...
@@ -2837,6 +2838,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult
.
add
(
param
);
continue
;
}
else
{
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if
(
Common
.
isEmpty
(
projectSetInfoVo
.
getServerItem
())){
param
.
setErrorMessage
(
"项目未维护服务项目,请联系管理员"
);
listResult
.
add
(
param
);
continue
;
}
String
[]
serverItemArr
=
projectSetInfoVo
.
getServerItem
().
split
(
"、"
);
// 服务项校验
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"商险"
))
{
param
.
setErrorMessage
(
"该项目未勾选 商险 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
);
listResult
.
add
(
param
);
continue
;
}
//对应的项目编码已停止合作
if
(
CommonConstants
.
ONE_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())
||
CommonConstants
.
TWO_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())){
...
...
@@ -3172,6 +3188,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult
.
add
(
param
);
continue
;
}
else
{
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if
(
Common
.
isEmpty
(
projectSetInfoVo
.
getServerItem
())){
param
.
setErrorMessage
(
"项目未维护服务项目,请联系管理员"
);
listResult
.
add
(
param
);
continue
;
}
String
[]
serverItemArr
=
projectSetInfoVo
.
getServerItem
().
split
(
"、"
);
// 服务项校验
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"商险"
))
{
param
.
setErrorMessage
(
"该项目未勾选 商险 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
);
listResult
.
add
(
param
);
continue
;
}
//对应的项目编码已停止合作
if
(
CommonConstants
.
ONE_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())
||
CommonConstants
.
TWO_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())){
...
...
@@ -3606,6 +3636,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult
.
add
(
param
);
continue
;
}
else
{
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if
(
Common
.
isEmpty
(
projectSetInfoVo
.
getServerItem
())){
param
.
setErrorMessage
(
"项目未维护服务项目,请联系管理员"
);
listResult
.
add
(
param
);
continue
;
}
String
[]
serverItemArr
=
projectSetInfoVo
.
getServerItem
().
split
(
"、"
);
// 服务项校验
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"商险"
))
{
param
.
setErrorMessage
(
"该项目未勾选 商险 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
);
listResult
.
add
(
param
);
continue
;
}
//对应的替换员工项目编码已停止合作
if
(
CommonConstants
.
ONE_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())
||
CommonConstants
.
TWO_STRING
.
equals
(
projectSetInfoVo
.
getStopFlag
())){
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceWarnServiceImpl.java
View file @
3a0d2593
...
...
@@ -60,6 +60,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
List
<
TInsuranceAlert
>
list
=
baseMapper
.
selectInsuranceAlert
();
//获取所有在用的(未删除未锁定)MVP的用户信息
String
userIds
;
R
<
Set
<
String
>>
onlineSetTemp
;
if
(
Common
.
isNotKong
(
list
)){
try
{
SysConfig
sysConfig
=
sysConfigMapper
.
getSysConfigLimitByKey
(
InsurancesConstants
.
INSURANCE_ALERT_DEFAULT_PERSON
);
...
...
@@ -96,7 +97,32 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
log
.
error
(
"商险不购买提醒初始化停用客服异常:"
,
e
);
}
//处理已经离职数据,分批请求,每次请求1000条数据,返回在职人员信息
R
<
Set
<
String
>>
onlineSetTemp
=
new
R
<>();
onlineSetTemp
=
new
R
<>();
onlineSetTemp
=
getSetR
(
list
,
onlineSetTemp
);
//如果不存在离职人员直接走生成逻辑
if
(
Common
.
isNotKong
(
onlineSetTemp
.
getData
())){
// 从 onlineSetTemp 中获取离职人员信息 删除list中已离职的数据
removeLeaver
(
list
,
onlineSetTemp
);
}
//不为空生成数据
if
(
Common
.
isNotKong
(
list
)){
this
.
saveOrUpdateBatch
(
list
);
}
}
//批量删除已忽略且人员离职的数据
List
<
TInsuranceAlert
>
listIgnore
=
baseMapper
.
selectInsuranceAlertIgnore
();
onlineSetTemp
=
new
R
<>();
onlineSetTemp
=
getSetR
(
listIgnore
,
onlineSetTemp
);
if
(
Common
.
isNotKong
(
onlineSetTemp
.
getData
())){
//批量删除已忽略且人员离职的数据
baseMapper
.
delete
(
Wrappers
.<
TInsuranceAlert
>
query
().
lambda
()
.
in
(
TInsuranceAlert:
:
getEmpIdcardNo
,
onlineSetTemp
.
getData
()));
}
}
private
R
<
Set
<
String
>>
getSetR
(
List
<
TInsuranceAlert
>
list
,
R
<
Set
<
String
>>
onlineSetTemp
)
{
if
(
list
.
size
()
<=
2000
){
onlineSetTemp
=
archivesDaprUtil
.
getEmpOnlineMap
(
list
.
stream
().
map
(
TInsuranceAlert:
:
getEmpIdcardNo
).
collect
(
Collectors
.
toList
()));
}
else
{
...
...
@@ -136,17 +162,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
onlineSetTemp
.
setData
(
temp
);
}
}
//如果不存在离职人员直接走生成逻辑
if
(
Common
.
isNotKong
(
onlineSetTemp
.
getData
())){
// 从 onlineSetTemp 中获取离职人员信息 删除list中已离职的数据
removeLeaver
(
list
,
onlineSetTemp
);
}
//不为空生成数据
if
(
Common
.
isNotKong
(
list
)){
this
.
saveOrUpdateBatch
(
list
);
}
}
return
onlineSetTemp
;
}
/**
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceWarnMapper.xml
View file @
3a0d2593
...
...
@@ -154,6 +154,16 @@
select a.DEPT_NAME,a.DEPT_NO,
SUM(case when a.IS_OVERDUE='0' THEN 1 ELSE 0 END) as 'lq',
SUM(CASE WHEN a.IS_OVERDUE='1' THEN 1 ELSE 0 END) as 'gq'
from t_insurance_alert a GROUP BY a.DEPT_NO
from t_insurance_alert a where a.EXPIRE_IGNORE_FLAG = '1' and a.DELETE_FLAG='0' GROUP BY a.DEPT_NO
</select>
<select
id=
"selectInsuranceAlertIgnore"
resultMap=
"BaseResultMap"
>
SELECT
a.ID,
a.EMP_NAME,
a.EMP_IDCARD_NO
FROM
t_insurance_alert a
where a.DELETE_FLAG = '0' and a.EXPIRE_IGNORE_FLAG = '0'
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
3a0d2593
...
...
@@ -72,6 +72,7 @@ import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.apache.commons.lang.ArrayUtils
;
import
org.apache.poi.ss.usermodel.Cell
;
import
org.apache.poi.ss.usermodel.Sheet
;
import
org.apache.shardingsphere.transaction.annotation.ShardingTransactionType
;
...
...
@@ -2337,6 +2338,40 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_PROJECT_NOT_FOUND
)));
return
true
;
}
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if
(
Common
.
isEmpty
(
setInfoVo
.
getServerItem
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"项目未维护服务项目,请联系管理员"
));
return
true
;
}
String
[]
serverItemArr
=
setInfoVo
.
getServerItem
().
split
(
"、"
);
// 服务项校验
if
(
Common
.
isNotNull
(
excel
.
getSocialHousehold
())
&&
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"社保"
)
&&
!
ArrayUtils
.
contains
(
serverItemArr
,
"公积金"
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"该项目未勾选 社保和公积金 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
));
return
true
;
}
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"社保"
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"该项目未勾选 社保 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
));
return
true
;
}
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"公积金"
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"该项目未勾选 公积金 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
));
return
true
;
}
}
else
if
(
Common
.
isNotNull
(
excel
.
getSocialHousehold
()))
{
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"社保"
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"该项目未勾选 社保 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
));
return
true
;
}
}
else
{
if
(!
ArrayUtils
.
contains
(
serverItemArr
,
"公积金"
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"该项目未勾选 公积金 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"
));
return
true
;
}
}
//对应的项目编码已停止合作
if
(
CommonConstants
.
ONE_STRING
.
equals
(
setInfoVo
.
getStopFlag
())
||
CommonConstants
.
TWO_STRING
.
equals
(
setInfoVo
.
getStopFlag
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SETTLEDOMAIN_STOP
)));
...
...
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