Commit 8869d065 authored by hongguangwu's avatar hongguangwu

MVP1.7.15-税友拆分社保、医保

parent 77a8b7a0
...@@ -684,4 +684,6 @@ public interface CommonConstants { ...@@ -684,4 +684,6 @@ public interface CommonConstants {
String QIAN_MING = "qian_ming"; String QIAN_MING = "qian_ming";
// 税友、花名册、模板里的固定文字 // 税友、花名册、模板里的固定文字
String GU_DING = "gu_ding"; String GU_DING = "gu_ding";
// 税友、关键字里的户:
String HU_CORE = "_户户_";
} }
...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity; ...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...@@ -105,5 +106,8 @@ public class FailReasonConfig extends BaseEntity { ...@@ -105,5 +106,8 @@ public class FailReasonConfig extends BaseEntity {
@Schema(description = "截取标识右") @Schema(description = "截取标识右")
private String replaceRight; private String replaceRight;
// 户ID
@TableField(exist = false)
private String huId;
} }
\ No newline at end of file
...@@ -29,4 +29,7 @@ public interface FailReasonConfigMapper extends BaseMapper<FailReasonConfig> { ...@@ -29,4 +29,7 @@ public interface FailReasonConfigMapper extends BaseMapper<FailReasonConfig> {
// 获取list组装map来使用 hgw // 获取list组装map来使用 hgw
List<FailReasonConfig> getFailReasonConfigList(); List<FailReasonConfig> getFailReasonConfigList();
// 获取户里的配置
List<FailReasonConfig> getFailReasonConfigListByHu();
} }
...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl; ...@@ -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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.entity.FailReasonConfig;
import com.yifu.cloud.plus.v1.yifu.social.mapper.FailReasonConfigMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.FailReasonConfigMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.FailReasonConfigService; import com.yifu.cloud.plus.v1.yifu.social.service.FailReasonConfigService;
...@@ -46,9 +47,17 @@ public class FailReasonConfigServiceImpl extends ServiceImpl<FailReasonConfigMap ...@@ -46,9 +47,17 @@ public class FailReasonConfigServiceImpl extends ServiceImpl<FailReasonConfigMap
@Override @Override
public Map<String, FailReasonConfig> getFailReasonMap() { public Map<String, FailReasonConfig> getFailReasonMap() {
Map<String, FailReasonConfig> map = new HashMap<>(); Map<String, FailReasonConfig> map = new HashMap<>();
List<FailReasonConfig> list = baseMapper.getFailReasonConfigList(); List<FailReasonConfig> list = baseMapper.getFailReasonConfigListByHu();
for (FailReasonConfig config : list) { if (list != null && !list.isEmpty()) {
map.put(config.getReasonKey(), config); 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; return map;
} }
......
...@@ -234,7 +234,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -234,7 +234,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
updateSocial.setYgsRemarkOld(auditRemark); updateSocial.setYgsRemarkOld(auditRemark);
} else if (CommonConstants.THREE_STRING.equals(info.getZt())) { } else if (CommonConstants.THREE_STRING.equals(info.getZt())) {
// 如果找到了失败原因配置: // 如果找到了失败原因配置:
failConfig = getConfig(auditRemark, errorMap); failConfig = getConfig(auditRemark, errorMap, socialInfo.getSocialHousehold());
if (failConfig != null) { if (failConfig != null) {
updateSocial.setYgsRemark(failConfig.getSimpleReason()); updateSocial.setYgsRemark(failConfig.getSimpleReason());
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理 // failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
...@@ -323,7 +323,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -323,7 +323,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
} else if (CommonConstants.THREE_STRING.equals(info.getZt())) { } else if (CommonConstants.THREE_STRING.equals(info.getZt())) {
// 如果找到了失败原因配置: // 如果找到了失败原因配置:
failConfig = getConfig(auditRemark, errorMap); // 按户配置切换流向
failConfig = getConfig(auditRemark, errorMap, socialInfo.getSocialHousehold());
if (failConfig != null) { if (failConfig != null) {
updateSocial.setYsdRemark(failConfig.getSimpleReason()); updateSocial.setYsdRemark(failConfig.getSimpleReason());
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理 // failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
...@@ -444,44 +445,64 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -444,44 +445,64 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
* @Date: 2024/5/14 17:55 * @Date: 2024/5/14 17:55
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig * @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)) { if (errorMap != null && Common.isNotNull(msg)) {
FailReasonConfig configTemp; FailReasonConfig configTemp = null;
FailReasonConfig configReturn; FailReasonConfig configReturn;
for (Map.Entry<String, FailReasonConfig> config : errorMap.entrySet()) { // 1:找失败原因配置:
if (msg.contains(config.getKey())) { // 1.1:找户配置的
configTemp = config.getValue(); if (Common.isNotNull(huId)) {
// 有截取且截取左右标识都在: for (Map.Entry<String, FailReasonConfig> config : errorMap.entrySet()) {
if (Common.isNotNull(configTemp.getIsReplace()) if (config.getKey().contains(CommonConstants.HU_CORE)
&& CommonConstants.ONE_STRING.equals(configTemp.getIsReplace()) && huId.equals(config.getKey().split(CommonConstants.HU_CORE)[0])
&& Common.isNotNull(configTemp.getReplaceLeft()) && msg.contains(config.getKey())) {
&& Common.isNotNull(configTemp.getReplaceRight()) configTemp = config.getValue();
) { break;
String[] leftRes = msg.split(configTemp.getReplaceLeft()); }
if (leftRes.length > 1) { }
String result = null; }
for (int i = 1; i < leftRes.length; i++) { // 1.2:找通用配置
if (leftRes[i].contains(configTemp.getReplaceRight())) { if (configTemp == null) {
String[] rightRes = leftRes[i].split(configTemp.getReplaceRight()); for (Map.Entry<String, FailReasonConfig> config : errorMap.entrySet()) {
result = rightRes[0]; if (msg.contains(config.getKey())) {
break; configTemp = config.getValue();
} break;
} }
if (Common.isNotNull(result) && leftRes.length > 2 }
&& configTemp.getReplaceLeft().equals(configTemp.getReplaceRight())) { }
result = leftRes[1]; // 处理失败原因并返回
} if (configTemp != null) {
if (Common.isNotNull(result)) {
configReturn = new FailReasonConfig(); // 有截取且截取左右标识都在:
BeanUtil.copyProperties(configTemp, configReturn); if (Common.isNotNull(configTemp.getIsReplace())
configReturn.setSimpleReason(configReturn.getSimpleReason() && CommonConstants.ONE_STRING.equals(configTemp.getIsReplace())
+ configReturn.getReplaceLeft() + result + configReturn.getReplaceRight()); && Common.isNotNull(configTemp.getReplaceLeft())
return configReturn; && Common.isNotNull(configTemp.getReplaceRight())
) {
String[] leftRes = msg.split(configTemp.getReplaceLeft());
if (leftRes.length > 1) {
String result = null;
for (int i = 1; i < leftRes.length; i++) {
if (leftRes[i].contains(configTemp.getReplaceRight())) {
String[] rightRes = leftRes[i].split(configTemp.getReplaceRight());
result = rightRes[0];
break;
} }
} }
if (Common.isNotNull(result) && leftRes.length > 2
&& configTemp.getReplaceLeft().equals(configTemp.getReplaceRight())) {
result = leftRes[1];
}
if (Common.isNotNull(result)) {
configReturn = new FailReasonConfig();
BeanUtil.copyProperties(configTemp, configReturn);
configReturn.setSimpleReason(configReturn.getSimpleReason()
+ configReturn.getReplaceLeft() + result + configReturn.getReplaceRight());
return configReturn;
}
} }
return configTemp;
} }
return configTemp;
} }
} }
return null; return null;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<result property="isReplace" column="IS_REPLACE"/> <result property="isReplace" column="IS_REPLACE"/>
<result property="replaceLeft" column="REPLACE_LEFT"/> <result property="replaceLeft" column="REPLACE_LEFT"/>
<result property="replaceRight" column="REPLACE_RIGHT"/> <result property="replaceRight" column="REPLACE_RIGHT"/>
<result property="huId" column="hu_id"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -90,4 +91,27 @@ ...@@ -90,4 +91,27 @@
FROM fail_reason_config a FROM fail_reason_config a
where a.status = '0' where a.status = '0'
</select> </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> </mapper>
\ No newline at end of file
...@@ -646,6 +646,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id ...@@ -646,6 +646,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
SELECT SELECT
a.ID, a.ID,
a.EMP_NAME, a.EMP_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
a.YGS_REQUEST_ID, a.YGS_REQUEST_ID,
...@@ -670,6 +671,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id ...@@ -670,6 +671,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
SELECT SELECT
a.ID, a.ID,
a.EMP_NAME, a.EMP_NAME,
a.SOCIAL_HOUSEHOLD,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
a.YSD_REQUEST_ID, a.YSD_REQUEST_ID,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment