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
4a545edc
Commit
4a545edc
authored
May 12, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.10-批量自动化
parent
819d9f0c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
4 deletions
+55
-4
TDispatchInfoMapper.java
...cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
+9
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+34
-4
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+12
-0
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @
4a545edc
...
@@ -295,4 +295,13 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
...
@@ -295,4 +295,13 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
HouseNameConfigVo
getFundSumExportVoTwo
(
@Param
(
"houseName"
)
String
houseName
,
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
HouseNameConfigVo
getFundSumExportVoTwo
(
@Param
(
"houseName"
)
String
houseName
,
@Param
(
"tDispatchInfo"
)
SocialHandleSearchVo
dispatchInfo
);
List
<
AutoFlagVo
>
getAutoFlag
(
@Param
(
"idsList"
)
List
<
String
>
idsList
);
List
<
AutoFlagVo
>
getAutoFlag
(
@Param
(
"idsList"
)
List
<
String
>
idsList
);
/**
* @param idsList 派单IDlist
* @Description: 获取单个的推送的户的派单ID
* @Author: hgw
* @Date: 2025/5/12 18:31
* @return: java.util.List<java.lang.String>
**/
List
<
String
>
getSingleFlagMap
(
@Param
(
"idsList"
)
List
<
String
>
idsList
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
4a545edc
...
@@ -3492,6 +3492,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3492,6 +3492,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 获取所有派单对应的自动化配置信息
// 获取所有派单对应的自动化配置信息
Map
<
String
,
String
>
autoFlagMap
=
new
HashMap
<>();
Map
<
String
,
String
>
autoFlagMap
=
new
HashMap
<>();
autoFlagMap
=
getAutoFlagMap
(
idsList
,
autoFlagMap
);
autoFlagMap
=
getAutoFlagMap
(
idsList
,
autoFlagMap
);
// 户配置为单个推送的派单
Map
<
String
,
String
>
singleFlagMap
=
new
HashMap
<>();
singleFlagMap
=
getSingleFlagMap
(
idsList
,
singleFlagMap
);
if
(
Common
.
isNotNull
(
dispatchs
))
{
if
(
Common
.
isNotNull
(
dispatchs
))
{
// 获取所有派单查询信息
// 获取所有派单查询信息
Map
<
String
,
TSocialFundInfo
>
socialFundMap
=
initSocialFundMap
(
dispatchs
);
Map
<
String
,
TSocialFundInfo
>
socialFundMap
=
initSocialFundMap
(
dispatchs
);
...
@@ -3510,7 +3513,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3510,7 +3513,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
TDispatchSocialFundInfo
socialFundInfo
;
TDispatchSocialFundInfo
socialFundInfo
;
// 是否自动化办理,true:推送到社保士兵
// 是否自动化办理,true:推送到社保士兵
boolean
isAuto
;
boolean
isAuto
;
// 是否批量接口且含有社保且自动化且配置了单个,批量审核时,要跳过社保
// 2025-5-12 18:24:42 hgw
// true:可变更社保,false不可更新社保
boolean
isBatchSocialAuto
;
for
(
TDispatchInfo
dis
:
dispatchs
)
{
for
(
TDispatchInfo
dis
:
dispatchs
)
{
isBatchSocialAuto
=
true
;
autoFlag
=
autoFlagMap
.
get
(
dis
.
getId
());
autoFlag
=
autoFlagMap
.
get
(
dis
.
getId
());
if
(
Common
.
isEmpty
(
autoFlag
)){
if
(
Common
.
isEmpty
(
autoFlag
)){
autoFlag
=
"1"
;
autoFlag
=
"1"
;
...
@@ -3538,7 +3547,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3538,7 +3547,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorList
.
add
(
new
ErrorMessage
(-
1
,
"派单非待审核状态,禁止操作:"
+
dis
.
getEmpName
()));
errorList
.
add
(
new
ErrorMessage
(-
1
,
"派单非待审核状态,禁止操作:"
+
dis
.
getEmpName
()));
continue
;
continue
;
}
}
if
(
null
!=
socialInfo
)
{
// 批量审核+审核为自动化+户配置为单个推送
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
isSingleAudit
)
&&
singleFlagMap
.
get
(
dis
.
getId
())
!=
null
&&
CommonConstants
.
THREE_STRING
.
equals
(
auditStatus
))
{
isBatchSocialAuto
=
false
;
}
if
(
null
!=
socialInfo
&&
isBatchSocialAuto
)
{
// 派增审核
// 派增审核
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())){
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())){
//派增审核通过
//派增审核通过
...
@@ -3593,7 +3608,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3593,7 +3608,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
}
}
//自动化处理,如果未配置还是人工处理
//自动化处理,如果未配置还是人工处理
if
(
CommonConstants
.
THREE_STRING
.
equals
(
auditStatus
)){
if
(
CommonConstants
.
THREE_STRING
.
equals
(
auditStatus
))
{
// 初始化之前,保留原状态给 自动化办理查询使用 hgw 2025-4-27 17:37:09
// 初始化之前,保留原状态给 自动化办理查询使用 hgw 2025-4-27 17:37:09
socialInfo
.
setAddYgsHandleStatus
(
socialInfo
.
getYgsHandleStatus
());
socialInfo
.
setAddYgsHandleStatus
(
socialInfo
.
getYgsHandleStatus
());
socialInfo
.
setAddYsdHandleStatus
(
socialInfo
.
getYsdHandleStatus
());
socialInfo
.
setAddYsdHandleStatus
(
socialInfo
.
getYsdHandleStatus
());
...
@@ -3765,7 +3780,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3765,7 +3780,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
ServiceUtil
.
runTimeExceptionDiy
(
"更新人员档案、项目档案、合同状态异常:"
+
(
Common
.
isNotNull
(
res
)?
res
.
getMsg
():
CommonConstants
.
EMPTY_STRING
));
ServiceUtil
.
runTimeExceptionDiy
(
"更新人员档案、项目档案、合同状态异常:"
+
(
Common
.
isNotNull
(
res
)?
res
.
getMsg
():
CommonConstants
.
EMPTY_STRING
));
}
}
}
}
if
(
CommonConstants
.
ONE_INT
==
flag
&&
flagTemp
){
// 非(批量审核+审核为自动化+户配置为单个推送),才可以改社保
if
(
CommonConstants
.
ONE_INT
==
flag
&&
flagTemp
&&
isBatchSocialAuto
){
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())){
if
(
CommonConstants
.
dingleDigitStrArray
[
0
].
equals
(
dis
.
getType
())){
sf
.
setSocialStatus
(
CommonConstants
.
FOUR_STRING
);
sf
.
setSocialStatus
(
CommonConstants
.
FOUR_STRING
);
sf
.
setSocialAddStatus
(
CommonConstants
.
THREE_STRING
);
sf
.
setSocialAddStatus
(
CommonConstants
.
THREE_STRING
);
...
@@ -3808,7 +3824,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3808,7 +3824,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dis
.
setIsSingle
(
isSingleAudit
);
dis
.
setIsSingle
(
isSingleAudit
);
baseMapper
.
updateById
(
dis
);
baseMapper
.
updateById
(
dis
);
socialFundMapper
.
updateById
(
sf
);
socialFundMapper
.
updateById
(
sf
);
if
(
isAuto
)
{
// 非(批量审核+审核为自动化+户配置为单个推送),才可以改社保
if
(
isAuto
&&
isBatchSocialAuto
)
{
TSocialFreindSet
set
=
tSocialFreindSetService
.
getById
(
"1"
);
TSocialFreindSet
set
=
tSocialFreindSetService
.
getById
(
"1"
);
// 是否推送税友,默认不是,推送到士兵
// 是否推送税友,默认不是,推送到士兵
boolean
isFriend
=
false
;
boolean
isFriend
=
false
;
...
@@ -3893,6 +3910,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3893,6 +3910,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
autoFlagMap
;
return
autoFlagMap
;
}
}
private
Map
<
String
,
String
>
getSingleFlagMap
(
List
<
String
>
idsList
,
Map
<
String
,
String
>
singleFlagMap
)
{
List
<
String
>
singleFlagList
=
baseMapper
.
getSingleFlagMap
(
idsList
);
if
(
Common
.
isNotNull
(
singleFlagList
)){
if
(
Common
.
isNotNull
(
singleFlagMap
)){
singleFlagMap
=
new
HashMap
<>();
}
for
(
String
dispatchId
:
singleFlagList
){
singleFlagMap
.
put
(
dispatchId
,
CommonConstants
.
ONE_STRING
);
}
}
return
singleFlagMap
;
}
private
void
initReduceStatus
(
TSocialFundInfo
sf
,
TSocialInfo
socialInfo
)
{
private
void
initReduceStatus
(
TSocialFundInfo
sf
,
TSocialInfo
socialInfo
)
{
// 各个明细项的可派减项为待办理
// 各个明细项的可派减项为待办理
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getPensionHandle
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getPensionHandle
())){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sf
.
getPensionHandle
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getPensionHandle
())){
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
4a545edc
...
@@ -2750,4 +2750,16 @@
...
@@ -2750,4 +2750,16 @@
#{item}
#{item}
</foreach>
</foreach>
</select>
</select>
<select
id=
"getSingleFlagMap"
resultType=
"java.lang.String"
>
select a.id as "dispatchId"
FROM t_dispatch_info a
LEFT JOIN sys_house_hold_info b on a.SOCIAL_HOUSEHOLD_NAME=b.`NAME` and b.TYPE='0'
where a.SOCIAL_HOUSEHOLD_NAME is not null
and b.IS_SINGLE='1'
and a.id in
<foreach
item=
"item"
index=
"index"
collection=
"idsList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</select>
</mapper>
</mapper>
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