Commit 6dea47f8 authored by hongguangwu's avatar hongguangwu

MVP1.7.3-shuiyou 增减接口

parent 301c32d8
...@@ -62,6 +62,12 @@ public class TSocialFriendBackLog { ...@@ -62,6 +62,12 @@ public class TSocialFriendBackLog {
@ExcelProperty("请求ID") @ExcelProperty("请求ID")
@Schema(description = "请求ID") @Schema(description = "请求ID")
private String requestId; private String requestId;
@ExcelAttribute(name = "类型")
@ExcelProperty("类型")
@Schema(description = "类型")
private Integer type;
/** /**
* 日志 * 日志
*/ */
......
...@@ -84,7 +84,7 @@ public class SocialSoldierYsdAddVo implements Serializable { ...@@ -84,7 +84,7 @@ public class SocialSoldierYsdAddVo implements Serializable {
private String socialTown; private String socialTown;
@ExcelProperty("养老起缴日期") @ExcelProperty("养老起缴日期")
private String pensionStart; private String pensionStart;
;
@ExcelProperty("养老基数") @ExcelProperty("养老基数")
private BigDecimal unitPensionCardinal; private BigDecimal unitPensionCardinal;
@ExcelProperty("医疗起缴日期") @ExcelProperty("医疗起缴日期")
......
...@@ -333,8 +333,9 @@ public class SocialFriendConfig { ...@@ -333,8 +333,9 @@ public class SocialFriendConfig {
tszdxx.put("qyzgshbxzyhmc", vo.getQyzgshbxzyhmc()); tszdxx.put("qyzgshbxzyhmc", vo.getQyzgshbxzyhmc());
} else { } else {
// 企业职工基本医疗保险参保登记表 安徽非必填! 数组 // 企业职工基本医疗保险参保登记表 安徽非必填! 数组
String[] arr = {vo.getQyzgjbylbxcbdjb()};
// 增员、减员必填 // 增员、减员必填
tszdxx.put("qyzgjbylbxcbdjb", vo.getQyzgjbylbxcbdjb()); tszdxx.put("qyzgjbylbxcbdjb", arr);
} }
cbrymdOne.put("tszdxx", tszdxx); cbrymdOne.put("tszdxx", tszdxx);
...@@ -399,7 +400,8 @@ public class SocialFriendConfig { ...@@ -399,7 +400,8 @@ public class SocialFriendConfig {
// tszdxx.put("zgshbxjshmc", ) // tszdxx.put("zgshbxjshmc", )
if (type > 2) { if (type > 2) {
// 职工基本医疗保险参保登记表 // 职工基本医疗保险参保登记表
tszdxx.put("zgjbylbxcbdjb", vo.getQyzgjbylbxcbdjb()); String[] arr = {vo.getQyzgjbylbxcbdjb()};
tszdxx.put("zgjbylbxcbdjb", arr);
} }
cbrymdOne.put("tszdxx", tszdxx); cbrymdOne.put("tszdxx", tszdxx);
cbrymdArr.add(cbrymdOne); cbrymdArr.add(cbrymdOne);
......
...@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import java.net.URL;
import java.util.List; import java.util.List;
/** /**
......
...@@ -20,9 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.social.service; ...@@ -20,9 +20,6 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.FriendResult;
import java.util.List;
/** /**
* 社保士兵 * 社保士兵
...@@ -33,7 +30,7 @@ import java.util.List; ...@@ -33,7 +30,7 @@ import java.util.List;
public interface TSocialFriendService extends IService<TSocialInfo> { public interface TSocialFriendService extends IService<TSocialInfo> {
/** /**
* @Description: 查看社保士兵反馈情况 * @Description: 查看税友反馈情况
* @Author: hgw * @Author: hgw
* @Date: 2024/5/11 14:45 * @Date: 2024/5/11 14:45
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
......
...@@ -64,6 +64,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -64,6 +64,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
private final TSocialDeadlineInfoService tSocialDeadlineInfoService; private final TSocialDeadlineInfoService tSocialDeadlineInfoService;
private final TSocialSoldierLogService tSocialSoldierLogService; private final TSocialSoldierLogService tSocialSoldierLogService;
private final TSocialFriendBackLogService tSocialFriendBackLogService; private final TSocialFriendBackLogService tSocialFriendBackLogService;
private final TSocialFreindSetService tSocialFreindSetService;
private final TSocialInfoMapper socialMapper; private final TSocialInfoMapper socialMapper;
@Autowired @Autowired
private ExcelMergeImage excelMergeImage; private ExcelMergeImage excelMergeImage;
...@@ -88,6 +89,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -88,6 +89,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
**/ **/
@Override @Override
public R<String> pushFriend(List<String> dispatchIdList) { public R<String> pushFriend(List<String> dispatchIdList) {
TSocialFreindSet set = tSocialFreindSetService.getById("1");
if (set != null && Common.isNotNull(set.getType()) && 1 == set.getType()) {
// 获取时间限制配置(获取 当月启用 的配置) // 获取时间限制配置(获取 当月启用 的配置)
Map<String, TSocialDeadlineInfo> socialSetMap = tSocialDeadlineInfoService.getSocialSetByAreaId(); Map<String, TSocialDeadlineInfo> socialSetMap = tSocialDeadlineInfoService.getSocialSetByAreaId();
...@@ -121,6 +124,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -121,6 +124,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
) { ) {
return R.failed("无数据,推送结束!"); return R.failed("无数据,推送结束!");
} }
}
return R.ok("推送成功!!"); return R.ok("推送成功!!");
} }
...@@ -153,6 +157,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -153,6 +157,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
backLog = new TSocialFriendBackLog(); backLog = new TSocialFriendBackLog();
backLog.setSocialId(vo.getSocialId()); backLog.setSocialId(vo.getSocialId());
backLog.setType(type);
// 房工接口,获取 企业职工社会保险增员花名册 url // 房工接口,获取 企业职工社会保险增员花名册 url
urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode()); urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode());
if (urlR != null && urlR.getCode()==200 && Common.isNotNull(urlR.getData())) { if (urlR != null && urlR.getCode()==200 && Common.isNotNull(urlR.getData())) {
...@@ -231,6 +236,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -231,6 +236,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
backLog = new TSocialFriendBackLog(); backLog = new TSocialFriendBackLog();
backLog.setSocialId(vo.getSocialId()); backLog.setSocialId(vo.getSocialId());
backLog.setType(type);
// 房工接口,获取 企业职工基本医疗保险参保登记表 url // 房工接口,获取 企业职工基本医疗保险参保登记表 url
urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode()); urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode());
if (urlR != null && urlR.getCode()==200 && Common.isNotNull(urlR.getData())) { if (urlR != null && urlR.getCode()==200 && Common.isNotNull(urlR.getData())) {
...@@ -625,6 +631,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -625,6 +631,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
inputStreamOut = new FileInputStream(outFile); inputStreamOut = new FileInputStream(outFile);
// 转换成图片 完成后清理流 // 转换成图片 完成后清理流
TSocialFriendBackLog backLog = new TSocialFriendBackLog(); TSocialFriendBackLog backLog = new TSocialFriendBackLog();
backLog.setType(Integer.parseInt(type));
R<String> ulrR = excelToImage.excelToImg(inputStreamOut,socialFriendConfig,restTemplate, backLog); R<String> ulrR = excelToImage.excelToImg(inputStreamOut,socialFriendConfig,restTemplate, backLog);
tSocialFriendBackLogService.save(backLog); tSocialFriendBackLogService.save(backLog);
return ulrR; return ulrR;
...@@ -888,6 +895,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -888,6 +895,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
inputStreamOut = new FileInputStream(outFile); inputStreamOut = new FileInputStream(outFile);
// 转换成图片 完成后清理流 // 转换成图片 完成后清理流
TSocialFriendBackLog backLog = new TSocialFriendBackLog(); TSocialFriendBackLog backLog = new TSocialFriendBackLog();
backLog.setType(Integer.parseInt(type));
R<String> ulrR = excelToImage.excelToImg(inputStreamOut,socialFriendConfig,restTemplate, backLog); R<String> ulrR = excelToImage.excelToImg(inputStreamOut,socialFriendConfig,restTemplate, backLog);
tSocialFriendBackLogService.save(backLog); tSocialFriendBackLogService.save(backLog);
return ulrR; return ulrR;
......
...@@ -57,6 +57,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -57,6 +57,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
private final TAuditInfoService tAuditInfoService; private final TAuditInfoService tAuditInfoService;
private final TSocialSoldierLogService tSocialSoldierLogService; private final TSocialSoldierLogService tSocialSoldierLogService;
private final TSocialFriendBackLogService tSocialFriendBackLogService; private final TSocialFriendBackLogService tSocialFriendBackLogService;
private final TSocialFreindSetService tSocialFreindSetService;
/** /**
* @Description: 5 查看任务进度 * @Description: 5 查看任务进度
...@@ -66,6 +67,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -66,6 +67,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
**/ **/
@Override @Override
public R<String> getInfoByRequestId() { public R<String> getInfoByRequestId() {
TSocialFreindSet set = tSocialFreindSetService.getById("1");
if (set != null && Common.isNotNull(set.getType()) && 1 == set.getType()) {
// true养工失 false 医生大 // true养工失 false 医生大
boolean typeFlag = true; boolean typeFlag = true;
Set<String> dbAuthsSet = new HashSet<>(); Set<String> dbAuthsSet = new HashSet<>();
...@@ -121,6 +124,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -121,6 +124,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
tSocialFriendBackLogService.saveBatch(logList); tSocialFriendBackLogService.saveBatch(logList);
} }
} }
}
return R.ok(); return R.ok();
} }
...@@ -428,6 +432,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -428,6 +432,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
auditInfo.setId(null); auditInfo.setId(null);
auditInfo.setAuditStatus(CommonConstants.TWO_STRING); auditInfo.setAuditStatus(CommonConstants.TWO_STRING);
auditInfo.setAuditRemark(handleRemark); auditInfo.setAuditRemark(handleRemark);
if (Common.isNotNull(title) && title.length() > 255) {
title = title.substring(0, 255);
}
auditInfo.setTitle(title); auditInfo.setTitle(title);
auditInfo.setOrganName(user.getDeptName()); auditInfo.setOrganName(user.getDeptName());
auditInfo.setAuditUser(user.getNickname()); auditInfo.setAuditUser(user.getNickname());
......
...@@ -25,10 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; ...@@ -25,10 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig; import com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialDeadlineInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.*;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierLog;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierShenBaoTask;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.*; import com.yifu.cloud.plus.v1.yifu.social.service.*;
import com.yifu.cloud.plus.v1.yifu.social.vo.*; import com.yifu.cloud.plus.v1.yifu.social.vo.*;
...@@ -69,6 +66,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -69,6 +66,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
private final TAutoPaymentDetailService tAutoPaymentDetailService; private final TAutoPaymentDetailService tAutoPaymentDetailService;
private final TSocialDeadlineInfoService tSocialDeadlineInfoService; private final TSocialDeadlineInfoService tSocialDeadlineInfoService;
private final TSocialSoldierLogService tSocialSoldierLogService; private final TSocialSoldierLogService tSocialSoldierLogService;
private final TSocialFreindSetService tSocialFreindSetService;
// 安徽省之外的,默认社保士兵
private static final String SOCIAL_PROVINCE = "安徽省";
/** /**
* @param socialList * @param socialList
...@@ -162,6 +162,21 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -162,6 +162,21 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
return new CommonsMultipartFile(item); return new CommonsMultipartFile(item);
} }
/**
* @param
* @Description: 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
* @Author: hgw
* @Date: 2024/12/13 15:29
* @return: boolean
**/
private boolean getFriendSet() {
TSocialFreindSet set = tSocialFreindSetService.getById("1");
boolean setFlag = false;
if (set == null || Common.isEmpty(set.getType()) || 0 == set.getType()) {
setFlag = true;
}
return setFlag;
}
/** /**
* @Description: 推送到社保士兵 * @Description: 推送到社保士兵
* @Author: hgw * @Author: hgw
...@@ -171,6 +186,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -171,6 +186,9 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
@Override @Override
public R<String> pushSoldier(List<String> dispatchIdList) { public R<String> pushSoldier(List<String> dispatchIdList) {
// 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
boolean setFlag = getFriendSet();
// 获取时间限制配置(获取 当月启用 的配置) // 获取时间限制配置(获取 当月启用 的配置)
Map<String, TSocialDeadlineInfo> socialsetMap = tSocialDeadlineInfoService.getSocialSet(); Map<String, TSocialDeadlineInfo> socialsetMap = tSocialDeadlineInfoService.getSocialSet();
...@@ -178,23 +196,23 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -178,23 +196,23 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
// 养工失新增列表 // 养工失新增列表
List<SocialSoldierYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList); List<SocialSoldierYgsAddVo> ygsAddlist = baseMapper.getSocialSoldierYgsAddVoList(dispatchIdList);
if (ygsAddlist != null && !ygsAddlist.isEmpty()) { if (ygsAddlist != null && !ygsAddlist.isEmpty()) {
this.doPushSocialAndLogYgs(socialsetMap, ygsAddlist, "社保增员"); this.doPushSocialAndLogYgs(socialsetMap, ygsAddlist, "社保增员", setFlag);
} }
// 养工失减少列表 // 养工失减少列表
List<SocialSoldierYgsAddVo> ygsReducelist = baseMapper.getSocialSoldierYgsReduceVoList(dispatchIdList); List<SocialSoldierYgsAddVo> ygsReducelist = baseMapper.getSocialSoldierYgsReduceVoList(dispatchIdList);
if (ygsReducelist != null && !ygsReducelist.isEmpty()) { if (ygsReducelist != null && !ygsReducelist.isEmpty()) {
this.doPushSocialAndLogYgs(socialsetMap, ygsReducelist, "社保减员"); this.doPushSocialAndLogYgs(socialsetMap, ygsReducelist, "社保减员", setFlag);
} }
// 医生大新增列表 // 医生大新增列表
List<SocialSoldierYsdAddVo> ysdAddlist = baseMapper.getSocialSoldierYsdAddVoList(dispatchIdList); List<SocialSoldierYsdAddVo> ysdAddlist = baseMapper.getSocialSoldierYsdAddVoList(dispatchIdList);
if (ysdAddlist != null && !ysdAddlist.isEmpty()) { if (ysdAddlist != null && !ysdAddlist.isEmpty()) {
this.doPushSocialAndLogYsd(socialsetMap, ysdAddlist, "医保增员"); this.doPushSocialAndLogYsd(socialsetMap, ysdAddlist, "医保增员", setFlag);
} }
// 医生大减少列表 // 医生大减少列表
List<SocialSoldierYsdAddVo> ysdReducelist = baseMapper.getSocialSoldierYsdReduceVoList(dispatchIdList); List<SocialSoldierYsdAddVo> ysdReducelist = baseMapper.getSocialSoldierYsdReduceVoList(dispatchIdList);
if (ysdReducelist != null && !ysdReducelist.isEmpty()) { if (ysdReducelist != null && !ysdReducelist.isEmpty()) {
this.doPushSocialAndLogYsd(socialsetMap, ysdReducelist, "医保减员"); this.doPushSocialAndLogYsd(socialsetMap, ysdReducelist, "医保减员", setFlag);
} }
if ((ygsAddlist == null || ygsAddlist.isEmpty()) if ((ygsAddlist == null || ygsAddlist.isEmpty())
&& (ygsReducelist == null || ygsReducelist.isEmpty()) && (ygsReducelist == null || ygsReducelist.isEmpty())
...@@ -203,6 +221,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -203,6 +221,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
) { ) {
return R.failed("无数据,推送结束!"); return R.failed("无数据,推送结束!");
} }
return R.ok("推送成功!!"); return R.ok("推送成功!!");
} }
...@@ -213,7 +232,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -213,7 +232,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
* @return: void * @return: void
**/ **/
private void doPushSocialAndLogYgs(Map<String, TSocialDeadlineInfo> socialsetMap private void doPushSocialAndLogYgs(Map<String, TSocialDeadlineInfo> socialsetMap
, List<SocialSoldierYgsAddVo> ygsAddlist, String socialType) { , List<SocialSoldierYgsAddVo> ygsAddlist, String socialType, boolean setFlag) {
List<TSocialInfo> socialIdList = new ArrayList<>(); List<TSocialInfo> socialIdList = new ArrayList<>();
int canPushType; int canPushType;
TSocialInfo socialInfo; TSocialInfo socialInfo;
...@@ -224,6 +243,8 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -224,6 +243,8 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
String remark; String remark;
List<TSocialInfo> renGongList = new ArrayList<>(); List<TSocialInfo> renGongList = new ArrayList<>();
for (SocialSoldierYgsAddVo vo : ygsAddlist) { for (SocialSoldierYgsAddVo vo : ygsAddlist) {
if (setFlag || !SOCIAL_PROVINCE.equals(vo.getSocialProvince())) {
// 0:未到时间不动; 1:推送; 2:转人工 // 0:未到时间不动; 1:推送; 2:转人工
canPushType = this.getCanPushType(socialsetMap, vo); canPushType = this.getCanPushType(socialsetMap, vo);
...@@ -249,6 +270,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -249,6 +270,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
logList.add(socialLog); logList.add(socialLog);
} }
} }
}
if (!renGongList.isEmpty()) { if (!renGongList.isEmpty()) {
tSocialInfoService.updateBatchById(renGongList); tSocialInfoService.updateBatchById(renGongList);
} }
...@@ -281,7 +303,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -281,7 +303,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
* @return: void * @return: void
**/ **/
private void doPushSocialAndLogYsd(Map<String, TSocialDeadlineInfo> socialsetMap private void doPushSocialAndLogYsd(Map<String, TSocialDeadlineInfo> socialsetMap
, List<SocialSoldierYsdAddVo> ysdAddlist, String socialType) { , List<SocialSoldierYsdAddVo> ysdAddlist, String socialType, boolean setFlag) {
List<TSocialInfo> socialIdList = new ArrayList<>(); List<TSocialInfo> socialIdList = new ArrayList<>();
int canPushType; int canPushType;
TSocialInfo socialInfo; TSocialInfo socialInfo;
...@@ -292,6 +314,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -292,6 +314,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
List<TSocialInfo> renGongList = new ArrayList<>(); List<TSocialInfo> renGongList = new ArrayList<>();
String remark; String remark;
for (SocialSoldierYsdAddVo vo : ysdAddlist) { for (SocialSoldierYsdAddVo vo : ysdAddlist) {
if (setFlag || !SOCIAL_PROVINCE.equals(vo.getSocialProvince())) {
// 0:未到时间不动; 1:推送; 2:转人工 // 0:未到时间不动; 1:推送; 2:转人工
canPushType = this.getCanPushTypeYsd(socialsetMap, vo); canPushType = this.getCanPushTypeYsd(socialsetMap, vo);
...@@ -317,6 +340,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -317,6 +340,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
logList.add(socialLog); logList.add(socialLog);
} }
} }
}
if (!renGongList.isEmpty()) { if (!renGongList.isEmpty()) {
tSocialInfoService.updateBatchById(renGongList); tSocialInfoService.updateBatchById(renGongList);
} }
...@@ -464,6 +488,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -464,6 +488,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
**/ **/
@Override @Override
public R<String> pushSoldierByAudit() { public R<String> pushSoldierByAudit() {
// 养工失待审核列表 // 养工失待审核列表
List<SocialSoldierYgsAuditVo> ygsAddlist = baseMapper.getSocialSoldierYgsAuditVoList(); List<SocialSoldierYgsAuditVo> ygsAddlist = baseMapper.getSocialSoldierYgsAuditVoList();
List<SocialSoldierYgsAuditVo> ygsAddByGroupBylist = baseMapper.getSocialSoldierYgsAuditVoListByGroupBy(); List<SocialSoldierYgsAuditVo> ygsAddByGroupBylist = baseMapper.getSocialSoldierYgsAuditVoListByGroupBy();
......
...@@ -89,6 +89,10 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -89,6 +89,10 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
// 附件 // 附件
private final String RESULT_ANNEX = "resultAnnex"; private final String RESULT_ANNEX = "resultAnnex";
private final TSocialFreindSetService tSocialFreindSetService;
// 安徽省之外的,默认社保士兵
private static final String SOCIAL_PROVINCE = "安徽省";
/** /**
* @Description: 6每月6号定时任务获取社保士兵实缴3张表 * @Description: 6每月6号定时任务获取社保士兵实缴3张表
* @Author: hgw * @Author: hgw
...@@ -1476,6 +1480,22 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1476,6 +1480,22 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
return R.ok(voList); return R.ok(voList);
} }
/**
* @param
* @Description: 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
* @Author: hgw
* @Date: 2024/12/13 15:29
* @return: boolean
**/
private boolean getFriendSet() {
TSocialFreindSet set = tSocialFreindSetService.getById("1");
boolean setFlag = false;
if (set == null || Common.isEmpty(set.getType()) || 0 == set.getType()) {
setFlag = true;
}
return setFlag;
}
/** /**
* @param addId * @param addId
* @Description: 5 查看任务进度 * @Description: 5 查看任务进度
...@@ -1503,7 +1523,12 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1503,7 +1523,12 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
if (socialList != null && !socialList.isEmpty()) { if (socialList != null && !socialList.isEmpty()) {
Map<String, TSocialInfo> idCardMap = new HashMap<>(); Map<String, TSocialInfo> idCardMap = new HashMap<>();
Set<String> addIdSet = new HashSet<>(); Set<String> addIdSet = new HashSet<>();
// 查询配置开关是否为社保士兵 true:开 false 关(不是安徽省,也可以处理)
boolean setFlag = getFriendSet();
for (TSocialInfo socialInfo : socialList) { for (TSocialInfo socialInfo : socialList) {
if (setFlag || !SOCIAL_PROVINCE.equals(socialInfo.getSocialProvince())) {
if (Common.isNotNull(socialInfo.getYgsAddId())) { if (Common.isNotNull(socialInfo.getYgsAddId())) {
addIdSet.add(socialInfo.getYgsAddId()); addIdSet.add(socialInfo.getYgsAddId());
idCardMap.put(socialInfo.getYgsAddId() + CommonConstants.DOWN_LINE_STRING + socialInfo.getEmpIdcard(), socialInfo); idCardMap.put(socialInfo.getYgsAddId() + CommonConstants.DOWN_LINE_STRING + socialInfo.getEmpIdcard(), socialInfo);
...@@ -1513,6 +1538,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -1513,6 +1538,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
idCardMap.put(socialInfo.getYsdAddId() + CommonConstants.DOWN_LINE_STRING + socialInfo.getEmpIdcard(), socialInfo); idCardMap.put(socialInfo.getYsdAddId() + CommonConstants.DOWN_LINE_STRING + socialInfo.getEmpIdcard(), socialInfo);
} }
} }
}
HttpURLConnection conn; HttpURLConnection conn;
InputStream in = null; InputStream in = null;
Map<String, FailReasonConfig> errorMap = failReasonConfigService.getFailReasonMap(); Map<String, FailReasonConfig> errorMap = failReasonConfigService.getFailReasonMap();
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<result property="socialId" column="SOCIAL_ID"/> <result property="socialId" column="SOCIAL_ID"/>
<result property="requestId" column="REQUEST_ID"/> <result property="requestId" column="REQUEST_ID"/>
<result property="logInfo" column="LOG_INFO"/> <result property="logInfo" column="LOG_INFO"/>
<result property="type" column="TYPE"/>
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
</resultMap> </resultMap>
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<sql id="where_getSocialSoldier_base_handler"> <sql id="where_getSocialSoldier_base_handler">
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0' and a.SOCIAL_PROVINCE = '12'
<if test="idsStr != null and idsStr.size > 0"> <if test="idsStr != null and idsStr.size > 0">
AND a.ID in AND a.ID in
<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")"> <foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
......
...@@ -595,6 +595,7 @@ ...@@ -595,6 +595,7 @@
<select id="getSocialSoldierYgsAll" resultMap="tSocialInfoMap"> <select id="getSocialSoldierYgsAll" resultMap="tSocialInfoMap">
SELECT SELECT
a.ID, a.ID,
a.SOCIAL_PROVINCE,
a.EMP_NAME, a.EMP_NAME,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
...@@ -618,6 +619,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id ...@@ -618,6 +619,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
<select id="getSocialSoldierYsdAll" resultMap="tSocialInfoMap"> <select id="getSocialSoldierYsdAll" resultMap="tSocialInfoMap">
SELECT SELECT
a.ID, a.ID,
a.SOCIAL_PROVINCE,
a.EMP_NAME, a.EMP_NAME,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
a.EMP_IDCARD, a.EMP_IDCARD,
......
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