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
8869d065
Commit
8869d065
authored
Sep 12, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.15-税友拆分社保、医保
parent
77a8b7a0
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
102 additions
and
37 deletions
+102
-37
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
FailReasonConfig.java
...fu/cloud/plus/v1/yifu/social/entity/FailReasonConfig.java
+4
-0
FailReasonConfigMapper.java
...ud/plus/v1/yifu/social/mapper/FailReasonConfigMapper.java
+3
-0
FailReasonConfigServiceImpl.java
...yifu/social/service/impl/FailReasonConfigServiceImpl.java
+12
-3
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+55
-34
FailReasonConfigMapper.xml
...-biz/src/main/resources/mapper/FailReasonConfigMapper.xml
+24
-0
TSocialInfoMapper.xml
...ocial-biz/src/main/resources/mapper/TSocialInfoMapper.xml
+2
-0
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
8869d065
...
...
@@ -684,4 +684,6 @@ public interface CommonConstants {
String
QIAN_MING
=
"qian_ming"
;
// 税友、花名册、模板里的固定文字
String
GU_DING
=
"gu_ding"
;
// 税友、关键字里的户:
String
HU_CORE
=
"_户户_"
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/FailReasonConfig.java
View file @
8869d065
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
...
...
@@ -105,5 +106,8 @@ public class FailReasonConfig extends BaseEntity {
@Schema
(
description
=
"截取标识右"
)
private
String
replaceRight
;
// 户ID
@TableField
(
exist
=
false
)
private
String
huId
;
}
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/FailReasonConfigMapper.java
View file @
8869d065
...
...
@@ -29,4 +29,7 @@ public interface FailReasonConfigMapper extends BaseMapper<FailReasonConfig> {
// 获取list组装map来使用 hgw
List
<
FailReasonConfig
>
getFailReasonConfigList
();
// 获取户里的配置
List
<
FailReasonConfig
>
getFailReasonConfigListByHu
();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/FailReasonConfigServiceImpl.java
View file @
8869d065
...
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.FailReasonConfigMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.FailReasonConfigService
;
...
...
@@ -46,10 +47,18 @@ public class FailReasonConfigServiceImpl extends ServiceImpl<FailReasonConfigMap
@Override
public
Map
<
String
,
FailReasonConfig
>
getFailReasonMap
()
{
Map
<
String
,
FailReasonConfig
>
map
=
new
HashMap
<>();
List
<
FailReasonConfig
>
list
=
baseMapper
.
getFailReasonConfigList
();
List
<
FailReasonConfig
>
list
=
baseMapper
.
getFailReasonConfigListByHu
();
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
for
(
FailReasonConfig
config
:
list
)
{
map
.
put
(
config
.
getHuId
()
+
CommonConstants
.
HU_CORE
+
config
.
getReasonKey
(),
config
);
}
}
list
=
baseMapper
.
getFailReasonConfigList
();
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
for
(
FailReasonConfig
config
:
list
)
{
map
.
put
(
config
.
getReasonKey
(),
config
);
}
}
return
map
;
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
8869d065
...
...
@@ -234,7 +234,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
updateSocial
.
setYgsRemarkOld
(
auditRemark
);
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
info
.
getZt
()))
{
// 如果找到了失败原因配置:
failConfig
=
getConfig
(
auditRemark
,
errorMap
);
failConfig
=
getConfig
(
auditRemark
,
errorMap
,
socialInfo
.
getSocialHousehold
()
);
if
(
failConfig
!=
null
)
{
updateSocial
.
setYgsRemark
(
failConfig
.
getSimpleReason
());
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
...
...
@@ -323,7 +323,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
info
.
getZt
()))
{
// 如果找到了失败原因配置:
failConfig
=
getConfig
(
auditRemark
,
errorMap
);
// 按户配置切换流向
failConfig
=
getConfig
(
auditRemark
,
errorMap
,
socialInfo
.
getSocialHousehold
());
if
(
failConfig
!=
null
)
{
updateSocial
.
setYsdRemark
(
failConfig
.
getSimpleReason
());
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
...
...
@@ -444,13 +445,34 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
* @Date: 2024/5/14 17:55
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig
**/
private
FailReasonConfig
getConfig
(
String
msg
,
Map
<
String
,
FailReasonConfig
>
errorMap
)
{
private
FailReasonConfig
getConfig
(
String
msg
,
Map
<
String
,
FailReasonConfig
>
errorMap
,
String
huId
)
{
if
(
errorMap
!=
null
&&
Common
.
isNotNull
(
msg
))
{
FailReasonConfig
configTemp
;
FailReasonConfig
configTemp
=
null
;
FailReasonConfig
configReturn
;
// 1:找失败原因配置:
// 1.1:找户配置的
if
(
Common
.
isNotNull
(
huId
))
{
for
(
Map
.
Entry
<
String
,
FailReasonConfig
>
config
:
errorMap
.
entrySet
())
{
if
(
config
.
getKey
().
contains
(
CommonConstants
.
HU_CORE
)
&&
huId
.
equals
(
config
.
getKey
().
split
(
CommonConstants
.
HU_CORE
)[
0
])
&&
msg
.
contains
(
config
.
getKey
()))
{
configTemp
=
config
.
getValue
();
break
;
}
}
}
// 1.2:找通用配置
if
(
configTemp
==
null
)
{
for
(
Map
.
Entry
<
String
,
FailReasonConfig
>
config
:
errorMap
.
entrySet
())
{
if
(
msg
.
contains
(
config
.
getKey
()))
{
configTemp
=
config
.
getValue
();
break
;
}
}
}
// 处理失败原因并返回
if
(
configTemp
!=
null
)
{
// 有截取且截取左右标识都在:
if
(
Common
.
isNotNull
(
configTemp
.
getIsReplace
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
configTemp
.
getIsReplace
())
...
...
@@ -483,7 +505,6 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
return
configTemp
;
}
}
}
return
null
;
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/FailReasonConfigMapper.xml
View file @
8869d065
...
...
@@ -17,6 +17,7 @@
<result
property=
"isReplace"
column=
"IS_REPLACE"
/>
<result
property=
"replaceLeft"
column=
"REPLACE_LEFT"
/>
<result
property=
"replaceRight"
column=
"REPLACE_RIGHT"
/>
<result
property=
"huId"
column=
"hu_id"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -90,4 +91,27 @@
FROM fail_reason_config a
where a.status = '0'
</select>
<!--获取户配置的list组装map来使用 hgw-->
<select
id=
"getFailReasonConfigListByHu"
resultMap=
"failReasonConfigMap"
>
SELECT
a.ID,
a.REASON,
a.REASON_KEY,
a.SIMPLE_REASON,
r.REPLAY,
a.STATUS,
a.CREATE_TIME,
a.CREATE_NAME,
a.CREATE_BY,
a.UPDATE_TIME,
a.UPDATE_BY,
a.UPDATE_NAME,
a.IS_REPLACE,
a.REPLACE_LEFT,
a.REPLACE_RIGHT
,r.id hu_id
FROM sys_house_hold_info_fail_res r
LEFT JOIN fail_reason_config a on r.FAIL_ID=a.id
where a.status = '0'
</select>
</mapper>
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @
8869d065
...
...
@@ -646,6 +646,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
SELECT
a.ID,
a.EMP_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD,
a.YGS_REQUEST_ID,
...
...
@@ -670,6 +671,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
SELECT
a.ID,
a.EMP_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD,
a.YSD_REQUEST_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