Commit 5838e28f authored by hongguangwu's avatar hongguangwu

MVP1.7.3-shuiyou 增减接口

parent 5f9ce6f9
...@@ -65,7 +65,7 @@ public class TSocialFriendBackLog { ...@@ -65,7 +65,7 @@ public class TSocialFriendBackLog {
@ExcelAttribute(name = "类型") @ExcelAttribute(name = "类型")
@ExcelProperty("类型") @ExcelProperty("类型")
@Schema(description = "类型") @Schema(description = "类型1社保增 2社保减 3医保增 4医保减 5推送的日志")
private Integer type; private Integer type;
/** /**
......
...@@ -74,7 +74,7 @@ public class SocialFriendConfig { ...@@ -74,7 +74,7 @@ public class SocialFriendConfig {
* @return: java.lang.String * @return: java.lang.String
**/ **/
public String pushFriendByInfo(RestTemplate restTemplate, SociaFriendYgsAddVo vo, int type, String thisTime public String pushFriendByInfo(RestTemplate restTemplate, SociaFriendYgsAddVo vo, int type, String thisTime
, TSocialFriendBackLog backLog) { , List<TSocialFriendBackLog> backLogList) {
String addId = ""; String addId = "";
String appAddUrl = urlPre; String appAddUrl = urlPre;
if (type == 1 || type == 3) { if (type == 1 || type == 3) {
...@@ -139,11 +139,21 @@ public class SocialFriendConfig { ...@@ -139,11 +139,21 @@ public class SocialFriendConfig {
setEmpInfo(json, vo, type); setEmpInfo(json, vo, type);
HttpEntity<String> formEntity = new HttpEntity<>(json.toString(), headers); HttpEntity<String> formEntity = new HttpEntity<>(json.toString(), headers);
System.out.println("推的接送=" + json); // 推的json
TSocialFriendBackLog backLog = new TSocialFriendBackLog();
backLog.setSocialId(vo.getSocialId());
backLog.setType(5);
backLog.setLogInfo(json.toString());
backLog.setCreateTime(LocalDateTime.now());
backLogList.add(backLog);
String dataResultList = restTemplate.postForObject(appAddUrl, formEntity, String.class); String dataResultList = restTemplate.postForObject(appAddUrl, formEntity, String.class);
// {"head":{"code":"00000000","description":"成功","msg":"成功","time":"2024-12-06 17:10:26","status":"Y" // {"head":{"code":"00000000","description":"成功","msg":"成功","time":"2024-12-06 17:10:26","status":"Y"
// ,"body":{"requestId":"85440b327d71466abcd9c5c81d5bb172" // ,"body":{"requestId":"85440b327d71466abcd9c5c81d5bb172"
if (Common.isNotNull(dataResultList)) { if (Common.isNotNull(dataResultList)) {
// 拉取的数据日志
backLog = new TSocialFriendBackLog();
backLog.setSocialId(vo.getSocialId());
backLog.setType(type);
backLog.setLogInfo(dataResultList); backLog.setLogInfo(dataResultList);
backLog.setCreateTime(LocalDateTime.now()); backLog.setCreateTime(LocalDateTime.now());
JSONObject dataObject = JSON.parseObject(dataResultList); JSONObject dataObject = JSON.parseObject(dataResultList);
...@@ -155,8 +165,10 @@ public class SocialFriendConfig { ...@@ -155,8 +165,10 @@ public class SocialFriendConfig {
String body = dataObject.getString("body"); String body = dataObject.getString("body");
JSONObject bodyObject = JSON.parseObject(body); JSONObject bodyObject = JSON.parseObject(body);
addId = bodyObject.getString("requestId"); addId = bodyObject.getString("requestId");
backLog.setRequestId(addId);
} }
} }
backLogList.add(backLog);
} }
return addId; return addId;
} }
......
...@@ -60,9 +60,9 @@ public interface TSocialSoldierLogService extends IService<TSocialSoldierLog> { ...@@ -60,9 +60,9 @@ public interface TSocialSoldierLogService extends IService<TSocialSoldierLog> {
TSocialSoldierLog getYsdSoldierLog(SocialSoldierYsdAddVo vo, String type, String remark); TSocialSoldierLog getYsdSoldierLog(SocialSoldierYsdAddVo vo, String type, String remark);
// 社保提交日志-税友 // 社保提交日志-税友
TSocialSoldierLog getYgsFriendLog(SociaFriendYgsAddVo vo, String type, String remark); TSocialSoldierLog getFriendLog(SociaFriendYgsAddVo vo, String type, String dispatchItem, String remark);
// 医保提交日志-税友 // 拉取提交结果日志 dispatchItem 社保、医保
TSocialSoldierLog getYsdFriendLog(SociaFriendYgsAddVo vo, String type, String remark); TSocialSoldierLog getSocialFriendLog(TSocialInfo social, String type, String dispatchItem, String remark);
// 审核社保提交日志 // 审核社保提交日志
TSocialSoldierLog getYgsSoldierAuditLog(SocialSoldierYgsAuditVo vo, String type, String remark); TSocialSoldierLog getYgsSoldierAuditLog(SocialSoldierYgsAuditVo vo, String type, String remark);
......
...@@ -81,6 +81,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -81,6 +81,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
@Autowired @Autowired
private TDispatchInfoMapper dispatchInfoMapper; private TDispatchInfoMapper dispatchInfoMapper;
/** /**
* @Description: 推送到税友 * @Description: 推送到税友
* @Author: hgw * @Author: hgw
...@@ -146,7 +147,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -146,7 +147,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
String requestId; String requestId;
String thisTime = DateUtil.getThisTime(); String thisTime = DateUtil.getThisTime();
List<TSocialFriendBackLog> backLogList = new ArrayList<>(); List<TSocialFriendBackLog> backLogList = new ArrayList<>();
TSocialFriendBackLog backLog;
R<String> urlR; R<String> urlR;
for (SociaFriendYgsAddVo vo : ygsAddlist) { for (SociaFriendYgsAddVo vo : ygsAddlist) {
// 0:未到时间不动; 1:推送; 2:转人工 // 0:未到时间不动; 1:推送; 2:转人工
...@@ -155,26 +155,21 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -155,26 +155,21 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
try { try {
socialInfo = new TSocialInfo(); socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
backLog = new TSocialFriendBackLog();
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())) {
vo.setQyzgshbxzyhmc(urlR.getData()); vo.setQyzgshbxzyhmc(urlR.getData());
} }
requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, type, thisTime, backLog); requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, type, thisTime, backLogList);
if (Common.isEmpty(requestId)) { if (Common.isEmpty(requestId)) {
socialInfo.setYgsRequestId("推送税友失败"); socialInfo.setYgsRequestId("推送税友失败");
socialInfo.setYgsHandleStatus(CommonConstants.FIVE_STRING); socialInfo.setYgsHandleStatus(CommonConstants.FIVE_STRING);
remark = "推送税友失败,转人工处理!"; remark = "推送税友失败,转人工处理!";
} else { } else {
backLog.setRequestId(requestId);
socialInfo.setYgsRequestId(requestId); socialInfo.setYgsRequestId(requestId);
socialInfo.setYgsHandleStatus(CommonConstants.TWO_STRING); socialInfo.setYgsHandleStatus(CommonConstants.TWO_STRING);
remark = "已推送提交任务!"; remark = "已推送提交任务!";
} }
backLogList.add(backLog);
tSocialInfoService.updateById(socialInfo); tSocialInfoService.updateById(socialInfo);
} catch (Exception e) { } catch (Exception e) {
remark = "提交社保士兵异常!"; remark = "提交社保士兵异常!";
...@@ -190,7 +185,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -190,7 +185,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
renGongList.add(socialInfo); renGongList.add(socialInfo);
} }
} }
socialLog = tSocialSoldierLogService.getYgsFriendLog(vo, typeStr, remark); socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, "社保", remark);
if (socialLog != null) { if (socialLog != null) {
logList.add(socialLog); logList.add(socialLog);
} }
...@@ -225,7 +220,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -225,7 +220,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
String requestId; String requestId;
String thisTime = DateUtil.getThisTime(); String thisTime = DateUtil.getThisTime();
List<TSocialFriendBackLog> backLogList = new ArrayList<>(); List<TSocialFriendBackLog> backLogList = new ArrayList<>();
TSocialFriendBackLog backLog;
R<String> urlR; R<String> urlR;
for (SociaFriendYgsAddVo vo : ysdAddlist) { for (SociaFriendYgsAddVo vo : ysdAddlist) {
// 0:未到时间不动; 1:推送; 2:转人工 // 0:未到时间不动; 1:推送; 2:转人工
...@@ -234,26 +228,21 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -234,26 +228,21 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
try { try {
socialInfo = new TSocialInfo(); socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
backLog = new TSocialFriendBackLog();
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())) {
vo.setQyzgjbylbxcbdjb(urlR.getData()); vo.setQyzgjbylbxcbdjb(urlR.getData());
} }
requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, type, thisTime, backLog); requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, type, thisTime, backLogList);
if (Common.isEmpty(requestId)) { if (Common.isEmpty(requestId)) {
socialInfo.setYsdRequestId("推送税友失败"); socialInfo.setYsdRequestId("推送税友失败");
socialInfo.setYsdHandleStatus(CommonConstants.FIVE_STRING); socialInfo.setYsdHandleStatus(CommonConstants.FIVE_STRING);
remark = "推送税友失败,转人工处理!"; remark = "推送税友失败,转人工处理!";
} else { } else {
backLog.setRequestId(requestId);
socialInfo.setYsdRequestId(requestId); socialInfo.setYsdRequestId(requestId);
socialInfo.setYsdHandleStatus(CommonConstants.TWO_STRING); socialInfo.setYsdHandleStatus(CommonConstants.TWO_STRING);
remark = "已推送提交任务!"; remark = "已推送提交任务!";
} }
backLogList.add(backLog);
tSocialInfoService.updateById(socialInfo); tSocialInfoService.updateById(socialInfo);
} catch (Exception e) { } catch (Exception e) {
remark = "提交社保士兵异常!"; remark = "提交社保士兵异常!";
...@@ -269,7 +258,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -269,7 +258,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
renGongList.add(socialInfo); renGongList.add(socialInfo);
} }
} }
socialLog = tSocialSoldierLogService.getYsdFriendLog(vo, typeStr, remark); socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, "医保", remark);
if (socialLog != null) { if (socialLog != null) {
logList.add(socialLog); logList.add(socialLog);
} }
...@@ -400,35 +389,35 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -400,35 +389,35 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} }
/** /**
* @return
* @Author fxj * @Author fxj
* @Description 查询当月已经审核通过的未办理完成的社保或医保 增减信息 * @Description 查询当月已经审核通过的未办理完成的社保或医保 增减信息
* @Date 15:58 2024/12/10 * @Date 15:58 2024/12/10
* @Param socialId:社保明细ID type: 1 社保增 2社保减 3 医保增 4 医保减 unitCreditCode:单位统一信用代码 * @Param socialId:社保明细ID type: 1 社保增 2社保减 3 医保增 4 医保减 unitCreditCode:单位统一信用代码
* @return
**/ **/
@Override @Override
public R<String> doExportRoster(String socialId, String type, String unitCreditCode) { public R<String> doExportRoster(String socialId, String type, String unitCreditCode) {
SocialHandleSearchVo searchVo = new SocialHandleSearchVo(); SocialHandleSearchVo searchVo = new SocialHandleSearchVo();
if (Common.isEmpty(socialId) || Common.isEmpty(type) || Common.isEmpty(unitCreditCode)){ if (Common.isEmpty(socialId) || Common.isEmpty(type) || Common.isEmpty(unitCreditCode)) {
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
} }
TSocialInfo socialInfo = socialMapper.selectById(socialId); TSocialInfo socialInfo = socialMapper.selectById(socialId);
if (Common.isEmpty(socialInfo)){ if (Common.isEmpty(socialInfo)) {
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR+":未获取到社保明细信息"); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR + ":未获取到社保明细信息");
} }
//查询户名称对应的户配置 以获取公章信息 //查询户名称对应的户配置 以获取公章信息
SysHouseHoldInfo holdInfo = houseHoldInfoMapper.selectOne(Wrappers.<SysHouseHoldInfo>query().lambda() SysHouseHoldInfo holdInfo = houseHoldInfoMapper.selectOne(Wrappers.<SysHouseHoldInfo>query().lambda()
.eq(SysHouseHoldInfo::getName,socialInfo.getSocialHouseholdName()) .eq(SysHouseHoldInfo::getName, socialInfo.getSocialHouseholdName())
.eq(SysHouseHoldInfo::getType,0) .eq(SysHouseHoldInfo::getType, 0)
.eq(SysHouseHoldInfo::getDelFlag,0) .eq(SysHouseHoldInfo::getDelFlag, 0)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(holdInfo)){ if (Common.isEmpty(holdInfo)) {
return R.failed(CommonConstants.RESULT_DATA_FAIL+":获取户配置信息失败"); return R.failed(CommonConstants.RESULT_DATA_FAIL + ":获取户配置信息失败");
} }
TAttaInfo att = attaInfoMapper.selectOne(Wrappers.<TAttaInfo>query().lambda() TAttaInfo att = attaInfoMapper.selectOne(Wrappers.<TAttaInfo>query().lambda()
.eq(TAttaInfo::getDomainId,holdInfo.getId()).last(CommonConstants.LAST_ONE_SQL)); .eq(TAttaInfo::getDomainId, holdInfo.getId()).last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(att)){ if (Common.isEmpty(att)) {
return R.failed(CommonConstants.RESULT_DATA_FAIL+":获取电子印章信息失败"); return R.failed(CommonConstants.RESULT_DATA_FAIL + ":获取电子印章信息失败");
} }
searchVo.setSocialHouseholdName(socialInfo.getSocialHouseholdName()); searchVo.setSocialHouseholdName(socialInfo.getSocialHouseholdName());
searchVo.setDisMonth(DateUtil.getThisMonth()); searchVo.setDisMonth(DateUtil.getThisMonth());
...@@ -438,30 +427,31 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -438,30 +427,31 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
searchVo.setSocialId(socialId); searchVo.setSocialId(socialId);
String fileName = DispatchConstants.SOCIAL_MEDICAL_EXPORT + searchVo.getSocialHouseholdName() + "_" + socialId + CommonConstants.XLS; String fileName = DispatchConstants.SOCIAL_MEDICAL_EXPORT + searchVo.getSocialHouseholdName() + "_" + socialId + CommonConstants.XLS;
String projectRoot = System.getProperty(CommonConstants.USER_DIR); String projectRoot = System.getProperty(CommonConstants.USER_DIR);
String filePath = projectRoot+CommonConstants.DOUBLE_LINE+fileName; String filePath = projectRoot + CommonConstants.DOUBLE_LINE + fileName;
//社保增减 //社保增减
if (CommonConstants.ONE_STRING.equals(type) || CommonConstants.TWO_STRING.equals(type)){ if (CommonConstants.ONE_STRING.equals(type) || CommonConstants.TWO_STRING.equals(type)) {
return doExportRosterSocial(searchVo,type,fileName,projectRoot,filePath,att.getAttaSrc()); return doExportRosterSocial(searchVo, type, fileName, projectRoot, filePath, att.getAttaSrc());
} }
//医保增减 //医保增减
if (CommonConstants.THREE_STRING.equals(type) || CommonConstants.FOUR_STRING.equals(type)){ if (CommonConstants.THREE_STRING.equals(type) || CommonConstants.FOUR_STRING.equals(type)) {
return doExportRosterMedical(searchVo,type,fileName,projectRoot,filePath,att.getAttaSrc()); return doExportRosterMedical(searchVo, type, fileName, projectRoot, filePath, att.getAttaSrc());
} }
return null; return null;
} }
/** /**
* @return
* @Author fxj * @Author fxj
* @Description 医保增加花名册 * @Description 医保增加花名册
* @Date 16:29 2024/12/10 * @Date 16:29 2024/12/10
* @Param * @Param
* @return
**/ **/
public R<String> doExportRosterMedical(SocialHandleSearchVo searchVo, public R<String> doExportRosterMedical(SocialHandleSearchVo searchVo,
String type, String type,
String fileName, String fileName,
String projectRoot, String projectRoot,
String filePath, String filePath,
String src){ String src) {
//获取要导出的列表 //获取要导出的列表
List<TDispatchSocialExportVo> list = new ArrayList<>(); List<TDispatchSocialExportVo> list = new ArrayList<>();
...@@ -479,7 +469,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -479,7 +469,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
WriteTable writeTable4; WriteTable writeTable4;
TDispatchSocialExportVo vo; TDispatchSocialExportVo vo;
List<Integer> columnIndexes = Arrays.asList(0,12); List<Integer> columnIndexes = Arrays.asList(0, 12);
CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes); CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes);
CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes); CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes); CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
...@@ -488,44 +478,44 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -488,44 +478,44 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
writeTable0 = EasyExcel.writerTable(0). writeTable0 = EasyExcel.writerTable(0).
head(headOne()). head(headOne()).
registerWriteHandler(customCellStyleStrategy). registerWriteHandler(customCellStyleStrategy).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 40, (short) 20)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(headTwo(searchVo.getSocialHouseholdName(),searchVo.getUnitCreditCode())). head(headTwo(searchVo.getSocialHouseholdName(), searchVo.getUnitCreditCode())).
registerWriteHandler(customCellStyleStrategyOne). registerWriteHandler(customCellStyleStrategyOne).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 25, (short) 20)).
build(); build();
writeTable2 = EasyExcel.writerTable(2). writeTable2 = EasyExcel.writerTable(2).
head(headThree()). head(headThree()).
registerWriteHandler(customCellStyleStrategyThree). registerWriteHandler(customCellStyleStrategyThree).
registerWriteHandler(new CustomCellWriteWidthConfig()). registerWriteHandler(new CustomCellWriteWidthConfig()).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 25, (short) 20))
.build(); .build();
writeTable3 = EasyExcel.writerTable(3). writeTable3 = EasyExcel.writerTable(3).
head(headFour()). head(headFour()).
registerWriteHandler(customCellStyleStrategyTwo). registerWriteHandler(customCellStyleStrategyTwo).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)50,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 50, (short) 20))
.build(); .build();
writeTable4 = EasyExcel.writerTable(4). writeTable4 = EasyExcel.writerTable(4).
head(headFive()). head(headFive()).
registerWriteHandler(customCellStyleStrategyTwo). registerWriteHandler(customCellStyleStrategyTwo).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)25,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 25, (short) 20))
.build(); .build();
//派增的数据--医保增员 //派增的数据--医保增员
if (CommonConstants.THREE_STRING.equals(type)){ if (CommonConstants.THREE_STRING.equals(type)) {
searchVo.setType(CommonConstants.ZERO_STRING); searchVo.setType(CommonConstants.ZERO_STRING);
long count = dispatchInfoMapper.getSocialDisRecordCount(searchVo); long count = dispatchInfoMapper.getSocialDisRecordCount(searchVo);
if (count > CommonConstants.ZERO_INT){ if (count > CommonConstants.ZERO_INT) {
list = dispatchInfoMapper.getSocialDisRecord(searchVo); list = dispatchInfoMapper.getSocialDisRecord(searchVo);
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
//判断list的大小是否大于10 //判断list的大小是否大于10
if (list.size() < 10) { if (list.size() < 10) {
int size = 10 - list.size(); int size = 10 - list.size();
int num = list.size() + 1; int num = list.size() + 1;
for (int i =1;i<= size;i++) { for (int i = 1; i <= size; i++) {
vo = new TDispatchSocialExportVo(); vo = new TDispatchSocialExportVo();
vo.setNum(num); vo.setNum(num);
num ++; num++;
list.add(vo); list.add(vo);
} }
} }
...@@ -544,31 +534,31 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -544,31 +534,31 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
excelWriter.write(new ArrayList<>(), writeSheet, writeTable1); excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
// 第二次写如也会创建头,然后在第一次的后面写入数据 // 第二次写如也会创建头,然后在第一次的后面写入数据
int num = 1; int num = 1;
for (int i =1;i<= 10;i++) { for (int i = 1; i <= 10; i++) {
vo = new TDispatchSocialExportVo(); vo = new TDispatchSocialExportVo();
vo.setNum(num); vo.setNum(num);
num ++; num++;
list.add(vo); list.add(vo);
} }
excelWriter.write(list, writeSheet, writeTable2); excelWriter.write(list, writeSheet, writeTable2);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable3); excelWriter.write(new ArrayList<>(), writeSheet, writeTable3);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable4); excelWriter.write(new ArrayList<>(), writeSheet, writeTable4);
} }
}else if (CommonConstants.FOUR_STRING.equals(type)){ } else if (CommonConstants.FOUR_STRING.equals(type)) {
//派减的数据--医保减员 //派减的数据--医保减员
searchVo.setType(CommonConstants.ONE_STRING); searchVo.setType(CommonConstants.ONE_STRING);
long count1 = dispatchInfoMapper.getSocialDisRecordCount(searchVo); long count1 = dispatchInfoMapper.getSocialDisRecordCount(searchVo);
if (count1 > CommonConstants.ZERO_INT){ if (count1 > CommonConstants.ZERO_INT) {
list = dispatchInfoMapper.getSocialReduceDisRecord(searchVo); list = dispatchInfoMapper.getSocialReduceDisRecord(searchVo);
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
//判断list的大小是否大于10 //判断list的大小是否大于10
if (list.size() < 10) { if (list.size() < 10) {
int size = 10 - list.size(); int size = 10 - list.size();
int num = list.size() + 1; int num = list.size() + 1;
for (int i =1;i<= size;i++) { for (int i = 1; i <= size; i++) {
vo = new TDispatchSocialExportVo(); vo = new TDispatchSocialExportVo();
vo.setNum(num); vo.setNum(num);
num ++; num++;
list.add(vo); list.add(vo);
} }
} }
...@@ -588,10 +578,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -588,10 +578,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 第二次写如也会创建头,然后在第一次的后面写入数据 // 第二次写如也会创建头,然后在第一次的后面写入数据
int num = 1; int num = 1;
list = new ArrayList<>(); list = new ArrayList<>();
for (int i =1;i<= 10;i++) { for (int i = 1; i <= 10; i++) {
vo = new TDispatchSocialExportVo(); vo = new TDispatchSocialExportVo();
vo.setNum(num); vo.setNum(num);
num ++; num++;
list.add(vo); list.add(vo);
} }
excelWriter.write(list, writeSheet, writeTable2); excelWriter.write(list, writeSheet, writeTable2);
...@@ -599,7 +589,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -599,7 +589,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
excelWriter.write(new ArrayList<>(), writeSheet, writeTable4); excelWriter.write(new ArrayList<>(), writeSheet, writeTable4);
} }
} }
if (excelWriter!= null) { if (excelWriter != null) {
excelWriter.finish(); excelWriter.finish();
} }
File outFile = null; File outFile = null;
...@@ -614,44 +604,44 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -614,44 +604,44 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
//读取文件 生成电子章 //读取文件 生成电子章
inputFile = new File(filePath); inputFile = new File(filePath);
inputStream = new FileInputStream(inputFile); inputStream = new FileInputStream(inputFile);
String tempPath = projectRoot+"//temp_"+fileName; String tempPath = projectRoot + "//temp_" + fileName;
tempFile = new File(tempPath); tempFile = new File(tempPath);
fileOUt = new FileOutputStream(tempFile); fileOUt = new FileOutputStream(tempFile);
URL url =ossUtil.getObjectUrl(null,src); URL url = ossUtil.getObjectUrl(null, src);
if (Common.isEmpty(url)){ if (Common.isEmpty(url)) {
return R.failed(CommonConstants.RESULT_DATA_FAIL+":电子印章OSS获取URL异常"); return R.failed(CommonConstants.RESULT_DATA_FAIL + ":电子印章OSS获取URL异常");
} }
inStream = url.openStream(); inStream = url.openStream();
if (Common.isEmpty(inStream)){ if (Common.isEmpty(inStream)) {
return R.failed(CommonConstants.RESULT_DATA_FAIL+":电子印章OSS获取流异常"); return R.failed(CommonConstants.RESULT_DATA_FAIL + ":电子印章OSS获取流异常");
} }
// 添加电子章 完成后关闭所有流 // 添加电子章 完成后关闭所有流
excelMergeImage.addPictureToExcel(inputStream,inStream,fileOUt,0,type); excelMergeImage.addPictureToExcel(inputStream, inStream, fileOUt, 0, type);
outFile = new File(tempPath); outFile = new File(tempPath);
inputStreamOut = new FileInputStream(outFile); inputStreamOut = new FileInputStream(outFile);
// 转换成图片 完成后清理流 // 转换成图片 完成后清理流
TSocialFriendBackLog backLog = new TSocialFriendBackLog(); TSocialFriendBackLog backLog = new TSocialFriendBackLog();
backLog.setType(Integer.parseInt(type)); 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;
}catch (Exception e){ } catch (Exception e) {
return R.failed("税友附件生成异常:"+e.getMessage()); return R.failed("税友附件生成异常:" + e.getMessage());
}finally { } finally {
// 清理文件 // 清理文件
finallyClose(inputFile, tempFile, outFile, inputStream, fileOUt, inStream,inputStreamOut); finallyClose(inputFile, tempFile, outFile, inputStream, fileOUt, inStream, inputStreamOut);
} }
}catch (Exception e){ } catch (Exception e) {
if (excelWriter!= null) { if (excelWriter != null) {
excelWriter.finish(); excelWriter.finish();
} }
log.error("税友附件生成异常" ,e); log.error("税友附件生成异常", e);
return R.failed("税友附件生成异常:"+e.getMessage()); return R.failed("税友附件生成异常:" + e.getMessage());
}finally { } finally {
if (null != createFile && createFile.exists()){ if (null != createFile && createFile.exists()) {
createFile.delete(); createFile.delete();
} }
if (null != list){ if (null != list) {
list.clear(); list.clear();
} }
} }
...@@ -664,42 +654,42 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -664,42 +654,42 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
FileOutputStream fileOUt, FileOutputStream fileOUt,
InputStream inStream, InputStream inStream,
FileInputStream inputStreamOut) throws IOException { FileInputStream inputStreamOut) throws IOException {
if (inputFile.exists()){ if (inputFile.exists()) {
inputFile.delete(); inputFile.delete();
} }
if (tempFile.exists()){ if (tempFile.exists()) {
tempFile.delete(); tempFile.delete();
} }
if (outFile.exists()){ if (outFile.exists()) {
outFile.delete(); outFile.delete();
} }
if (null != inputStream){ if (null != inputStream) {
inputStream.close(); inputStream.close();
} }
if (null != fileOUt){ if (null != fileOUt) {
fileOUt.close(); fileOUt.close();
} }
if (null != inStream){ if (null != inStream) {
inStream.close(); inStream.close();
} }
if (null != inputStreamOut){ if (null != inputStreamOut) {
inputStreamOut.close(); inputStreamOut.close();
} }
} }
/** /**
* @return
* @Author fxj * @Author fxj
* @Description 社保增减花名册 * @Description 社保增减花名册
* @Date 16:28 2024/12/10 * @Date 16:28 2024/12/10
* @Param * @Param
* @return
**/ **/
public R<String> doExportRosterSocial(SocialHandleSearchVo searchVo, public R<String> doExportRosterSocial(SocialHandleSearchVo searchVo,
String type, String type,
String fileName, String fileName,
String projectRoot, String projectRoot,
String filePath, String filePath,
String src){ String src) {
//获取要导出的列表 //获取要导出的列表
List<TDispatchSocialPersionExportVo> list = new ArrayList<>(); List<TDispatchSocialPersionExportVo> list = new ArrayList<>();
ExcelWriter excelWriter = null; ExcelWriter excelWriter = null;
...@@ -716,11 +706,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -716,11 +706,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
WriteTable writeTable4; WriteTable writeTable4;
TDispatchSocialPersionExportVo vo; TDispatchSocialPersionExportVo vo;
TDispatchSocialPersionReduceExportVo reduceVo; TDispatchSocialPersionReduceExportVo reduceVo;
if (CommonConstants.ONE_STRING.equals(type)){ if (CommonConstants.ONE_STRING.equals(type)) {
//派增的数据--社保 //派增的数据--社保
searchVo.setType(CommonConstants.ZERO_STRING); searchVo.setType(CommonConstants.ZERO_STRING);
long count = dispatchInfoMapper.getSocialPersionDisCount(searchVo); long count = dispatchInfoMapper.getSocialPersionDisCount(searchVo);
List<Integer> columnIndexes = Arrays.asList(0,17); List<Integer> columnIndexes = Arrays.asList(0, 17);
CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes); CustomCellStyleStrategy customCellStyleStrategy = new CustomCellStyleStrategy(columnIndexes);
CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes); CustomCellStyleOneStrategy customCellStyleStrategyOne = new CustomCellStyleOneStrategy(columnIndexes);
CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes); CustomCellStyleTwoStrategy customCellStyleStrategyTwo = new CustomCellStyleTwoStrategy(columnIndexes);
...@@ -729,40 +719,40 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -729,40 +719,40 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
writeTable0 = EasyExcel.writerTable(0). writeTable0 = EasyExcel.writerTable(0).
head(persionHeadOne()). head(persionHeadOne()).
registerWriteHandler(customCellStyleStrategy). registerWriteHandler(customCellStyleStrategy).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 40, (short) 20)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(persionHeadTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())). head(persionHeadTwo(searchVo.getSocialHouseholdName(), searchVo.getCustomerNo())).
registerWriteHandler(customCellStyleStrategyOne). registerWriteHandler(customCellStyleStrategyOne).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 20, (short) 20)).
build(); build();
writeTable2 = EasyExcel.writerTable(2). writeTable2 = EasyExcel.writerTable(2).
head(persionHead()). head(persionHead()).
registerWriteHandler(customCellStyleStrategyThree). registerWriteHandler(customCellStyleStrategyThree).
registerWriteHandler(new CustomCellWriteWidthOneConfig()). registerWriteHandler(new CustomCellWriteWidthOneConfig()).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)30,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 30, (short) 20))
.build(); .build();
writeTable3 = EasyExcel.writerTable(3). writeTable3 = EasyExcel.writerTable(3).
head(persionHeadThree()). head(persionHeadThree()).
registerWriteHandler(customCellStyleStrategyTwo). registerWriteHandler(customCellStyleStrategyTwo).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)150,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 150, (short) 20))
.build(); .build();
writeTable4 = EasyExcel.writerTable(4). writeTable4 = EasyExcel.writerTable(4).
head(persionHead1()). head(persionHead1()).
registerWriteHandler(customCellStyleStrategyTwo). registerWriteHandler(customCellStyleStrategyTwo).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 20, (short) 20))
.build(); .build();
if (count > CommonConstants.ZERO_INT){ if (count > CommonConstants.ZERO_INT) {
list = dispatchInfoMapper.getSocialPersionDisRecord(searchVo); list = dispatchInfoMapper.getSocialPersionDisRecord(searchVo);
if (Common.isNotNull(list)) { if (Common.isNotNull(list)) {
//判断list的大小是否大于10 //判断list的大小是否大于10
if (list.size() < 10) { if (list.size() < 10) {
int size = 10 - list.size(); int size = 10 - list.size();
int num = list.size() + 1; int num = list.size() + 1;
for (int i =1;i<= size;i++) { for (int i = 1; i <= size; i++) {
vo = new TDispatchSocialPersionExportVo(); vo = new TDispatchSocialPersionExportVo();
vo.setNum(num); vo.setNum(num);
num ++; num++;
list.add(vo); list.add(vo);
} }
} }
...@@ -780,24 +770,24 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -780,24 +770,24 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
excelWriter.write(new ArrayList<>(), writeSheet, writeTable0); excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable1); excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
int num = 1; int num = 1;
for (int i =1;i<= 10;i++) { for (int i = 1; i <= 10; i++) {
vo = new TDispatchSocialPersionExportVo(); vo = new TDispatchSocialPersionExportVo();
vo.setNum(num); vo.setNum(num);
num ++; num++;
list.add(vo); list.add(vo);
} }
excelWriter.write(list, writeSheet, writeTable2); excelWriter.write(list, writeSheet, writeTable2);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable3); excelWriter.write(new ArrayList<>(), writeSheet, writeTable3);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable4); excelWriter.write(new ArrayList<>(), writeSheet, writeTable4);
} }
}else if (CommonConstants.TWO_STRING.equals(type)){ } else if (CommonConstants.TWO_STRING.equals(type)) {
//派减的数据--社保 //派减的数据--社保
searchVo.setType(CommonConstants.ONE_STRING); searchVo.setType(CommonConstants.ONE_STRING);
long count1 = dispatchInfoMapper.getSocialPersionReduceDisCount(searchVo); long count1 = dispatchInfoMapper.getSocialPersionReduceDisCount(searchVo);
//获取要导出的列表 //获取要导出的列表
List<TDispatchSocialPersionReduceExportVo> listReduce = new ArrayList<>(); List<TDispatchSocialPersionReduceExportVo> listReduce = new ArrayList<>();
List<Integer> columnIndex = Arrays.asList(0,24); List<Integer> columnIndex = Arrays.asList(0, 24);
CustomCellStyleStrategy customCellStyleStrategy1 = new CustomCellStyleStrategy(columnIndex); CustomCellStyleStrategy customCellStyleStrategy1 = new CustomCellStyleStrategy(columnIndex);
CustomCellStyleOneStrategy customCellStyleStrategy2 = new CustomCellStyleOneStrategy(columnIndex); CustomCellStyleOneStrategy customCellStyleStrategy2 = new CustomCellStyleOneStrategy(columnIndex);
CustomCellStyleTwoStrategy customCellStyleStrategy3 = new CustomCellStyleTwoStrategy(columnIndex); CustomCellStyleTwoStrategy customCellStyleStrategy3 = new CustomCellStyleTwoStrategy(columnIndex);
...@@ -806,35 +796,35 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -806,35 +796,35 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
writeTable0 = EasyExcel.writerTable(0). writeTable0 = EasyExcel.writerTable(0).
head(persionReduceHeadOne()). head(persionReduceHeadOne()).
registerWriteHandler(customCellStyleStrategy1). registerWriteHandler(customCellStyleStrategy1).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 40, (short) 20)).
build(); build();
writeTable1 = EasyExcel.writerTable(1). writeTable1 = EasyExcel.writerTable(1).
head(persionReduceHeadTwo(searchVo.getSocialHouseholdName(),searchVo.getCustomerNo())). head(persionReduceHeadTwo(searchVo.getSocialHouseholdName(), searchVo.getCustomerNo())).
registerWriteHandler(customCellStyleStrategy2). registerWriteHandler(customCellStyleStrategy2).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)20,(short)20)). registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 20, (short) 20)).
build(); build();
writeTable2 = EasyExcel.writerTable(2). writeTable2 = EasyExcel.writerTable(2).
head(persionReduceHead()). head(persionReduceHead()).
registerWriteHandler(customCellStyleStrategy4). registerWriteHandler(customCellStyleStrategy4).
registerWriteHandler(new CustomCellWriteWidthTwoConfig()). registerWriteHandler(new CustomCellWriteWidthTwoConfig()).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)50,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 50, (short) 20))
.build(); .build();
writeTable3 = EasyExcel.writerTable(3). writeTable3 = EasyExcel.writerTable(3).
head(persionReduceHead1()). head(persionReduceHead1()).
registerWriteHandler(customCellStyleStrategy3). registerWriteHandler(customCellStyleStrategy3).
registerWriteHandler(new SimpleRowHeightStyleStrategy((short)40,(short)20)) registerWriteHandler(new SimpleRowHeightStyleStrategy((short) 40, (short) 20))
.build(); .build();
if (count1 > CommonConstants.ZERO_INT){ if (count1 > CommonConstants.ZERO_INT) {
listReduce = dispatchInfoMapper.getSocialPersionReduceDisRecord(searchVo); listReduce = dispatchInfoMapper.getSocialPersionReduceDisRecord(searchVo);
if (Common.isNotNull(listReduce)) { if (Common.isNotNull(listReduce)) {
//判断list的大小是否大于10 //判断list的大小是否大于10
if (listReduce.size() < 10) { if (listReduce.size() < 10) {
int size = 10 - listReduce.size(); int size = 10 - listReduce.size();
int num = listReduce.size() + 1; int num = listReduce.size() + 1;
for (int i =1;i<= size;i++) { for (int i = 1; i <= size; i++) {
reduceVo = new TDispatchSocialPersionReduceExportVo(); reduceVo = new TDispatchSocialPersionReduceExportVo();
reduceVo.setNum(num); reduceVo.setNum(num);
num ++; num++;
listReduce.add(reduceVo); listReduce.add(reduceVo);
} }
} }
...@@ -851,20 +841,20 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -851,20 +841,20 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
excelWriter.write(new ArrayList<>(), writeSheet, writeTable0); excelWriter.write(new ArrayList<>(), writeSheet, writeTable0);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable1); excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
int num = 1; int num = 1;
for (int i =1;i<= 10;i++) { for (int i = 1; i <= 10; i++) {
reduceVo = new TDispatchSocialPersionReduceExportVo(); reduceVo = new TDispatchSocialPersionReduceExportVo();
reduceVo.setNum(num); reduceVo.setNum(num);
num ++; num++;
listReduce.add(reduceVo); listReduce.add(reduceVo);
} }
excelWriter.write(listReduce, writeSheet, writeTable2); excelWriter.write(listReduce, writeSheet, writeTable2);
excelWriter.write(new ArrayList<>(), writeSheet, writeTable3); excelWriter.write(new ArrayList<>(), writeSheet, writeTable3);
} }
if (Common.isNotNull(listReduce)){ if (Common.isNotNull(listReduce)) {
listReduce.clear(); listReduce.clear();
} }
} }
if (excelWriter!= null) { if (excelWriter != null) {
excelWriter.finish(); excelWriter.finish();
} }
File inputFile = null; File inputFile = null;
...@@ -878,128 +868,128 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -878,128 +868,128 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
//读取文件 生成电子章 //读取文件 生成电子章
inputFile = new File(filePath); inputFile = new File(filePath);
inputStream = new FileInputStream(inputFile); inputStream = new FileInputStream(inputFile);
String tempPath = projectRoot+"//temp_"+fileName; String tempPath = projectRoot + "//temp_" + fileName;
tempFile = new File(tempPath); tempFile = new File(tempPath);
fileOUt = new FileOutputStream(tempFile); fileOUt = new FileOutputStream(tempFile);
URL url =ossUtil.getObjectUrl(null,src); URL url = ossUtil.getObjectUrl(null, src);
if (Common.isEmpty(url)){ if (Common.isEmpty(url)) {
return R.failed(CommonConstants.RESULT_DATA_FAIL+":电子印章OSS获取URL异常"); return R.failed(CommonConstants.RESULT_DATA_FAIL + ":电子印章OSS获取URL异常");
} }
inStream = url.openStream(); inStream = url.openStream();
if (Common.isEmpty(inStream)){ if (Common.isEmpty(inStream)) {
return R.failed(CommonConstants.RESULT_DATA_FAIL+":电子印章OSS获取流异常"); return R.failed(CommonConstants.RESULT_DATA_FAIL + ":电子印章OSS获取流异常");
} }
// 添加电子章 完成后关闭所有流 // 添加电子章 完成后关闭所有流
excelMergeImage.addPictureToExcel(inputStream,inStream,fileOUt,0,type); excelMergeImage.addPictureToExcel(inputStream, inStream, fileOUt, 0, type);
outFile = new File(tempPath); outFile = new File(tempPath);
inputStreamOut = new FileInputStream(outFile); inputStreamOut = new FileInputStream(outFile);
// 转换成图片 完成后清理流 // 转换成图片 完成后清理流
TSocialFriendBackLog backLog = new TSocialFriendBackLog(); TSocialFriendBackLog backLog = new TSocialFriendBackLog();
backLog.setType(Integer.parseInt(type)); 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;
}catch (Exception e){ } catch (Exception e) {
return R.failed("税友附件生成异常:"+e.getMessage()); return R.failed("税友附件生成异常:" + e.getMessage());
}finally { } finally {
// 清理文件 // 清理文件
finallyClose(inputFile, tempFile, outFile, inputStream, fileOUt, inStream,inputStreamOut); finallyClose(inputFile, tempFile, outFile, inputStream, fileOUt, inStream, inputStreamOut);
} }
}catch (Exception e){ } catch (Exception e) {
if (excelWriter!= null) { if (excelWriter != null) {
excelWriter.finish(); excelWriter.finish();
} }
log.error("税友附件生成异常" ,e); log.error("税友附件生成异常", e);
return R.failed("税友附件生成异常:"+e.getMessage()); return R.failed("税友附件生成异常:" + e.getMessage());
}finally { } finally {
finallyClear(list, createFile); finallyClear(list, createFile);
} }
} }
private void finallyClear(List<TDispatchSocialPersionExportVo> list, File createFile) { private void finallyClear(List<TDispatchSocialPersionExportVo> list, File createFile) {
if (null != createFile && createFile.exists()){ if (null != createFile && createFile.exists()) {
createFile.delete(); createFile.delete();
} }
if (null != list){ if (null != list) {
list.clear(); list.clear();
} }
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> headOne() { public List<List<String>> headOne() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a="合肥市基本医疗保险参保登记表"; String a = "合肥市基本医疗保险参保登记表";
//第一列-第十三列 //第一列-第十三列
for (int i =1;i<= 13;i++) { for (int i = 1; i <= 13; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> headTwo(String houseName,String cusNo) { public List<List<String>> headTwo(String houseName, String cusNo) {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String b = "单位名称(盖章): " + houseName + " 单位统一信用代码:" + (null == cusNo ? " " : cusNo); String b = "单位名称(盖章): " + houseName + " 单位统一信用代码:" + (null == cusNo ? " " : cusNo);
String c = "人员类型: □√单位职工 □灵活就业人员"; String c = "人员类型: □√单位职工 □灵活就业人员";
for (int i =1;i<= 13;i++) { for (int i = 1; i <= 13; i++) {
list.add(Lists.newArrayList(b,c)); list.add(Lists.newArrayList(b, c));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> headThree() { public List<List<String>> headThree() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String d="变更类别"; String d = "变更类别";
//第一列 //第一列
list.add( Lists.newArrayList("序号","序号")); list.add(Lists.newArrayList("序号", "序号"));
//第二列 //第二列
list.add( Lists.newArrayList("姓名","姓名")); list.add(Lists.newArrayList("姓名", "姓名"));
//第三列 //第三列
list.add( Lists.newArrayList("身份证件类型","身份证件类型")); list.add(Lists.newArrayList("身份证件类型", "身份证件类型"));
//第四列 //第四列
list.add( Lists.newArrayList("身份证件号码","身份证件号码")); list.add(Lists.newArrayList("身份证件号码", "身份证件号码"));
//第五列 //第五列
list.add( Lists.newArrayList("参报/停保时间","参报/停保时间")); list.add(Lists.newArrayList("参报/停保时间", "参报/停保时间"));
//第六列 //第六列
list.add( Lists.newArrayList("申报工资(元)","申报工资(元)")); list.add(Lists.newArrayList("申报工资(元)", "申报工资(元)"));
//变更类别 //变更类别
List<String> orderSpeaces = Lists.newArrayList("新增","续保","中断","终止"); List<String> orderSpeaces = Lists.newArrayList("新增", "续保", "中断", "终止");
orderSpeaces.forEach(e->{ orderSpeaces.forEach(e -> {
list.add( Lists.newArrayList(d ,e) ); list.add(Lists.newArrayList(d, e));
}); });
//第十一列 //第十一列
list.add( Lists.newArrayList("手机号码","手机号码")); list.add(Lists.newArrayList("手机号码", "手机号码"));
//第十二列 //第十二列
list.add( Lists.newArrayList("学历","学历")); list.add(Lists.newArrayList("学历", "学历"));
//第十三列 //第十三列
list.add( Lists.newArrayList("备注","备注")); list.add(Lists.newArrayList("备注", "备注"));
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> headFour() { public List<List<String>> headFour() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
...@@ -1008,114 +998,114 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -1008,114 +998,114 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
" 2.增加人员勾选新增或续保,减少人员勾选中断或终止,按相应类型进行勾选;\n" + " 2.增加人员勾选新增或续保,减少人员勾选中断或终止,按相应类型进行勾选;\n" +
" 3.联系电话务必填写准确的手机号码;"; " 3.联系电话务必填写准确的手机号码;";
//第一列-第十三列 //第一列-第十三列
for (int i =1;i<= 13;i++) { for (int i = 1; i <= 13; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> headFive() { public List<List<String>> headFive() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
String b="填报人: 联系电话: 经办人(盖章): " + String b = "填报人: 联系电话: 经办人(盖章): " +
DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getYear(DateUtil.getCurrentDateTime()) + " 年" + " " +
DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) + " 月" + " " +
DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日"; DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
//第一列-第十三列 //第一列-第十三列
for (int i =1;i<= 13;i++) { for (int i = 1; i <= 13; i++) {
list.add(Lists.newArrayList(b)); list.add(Lists.newArrayList(b));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> persionHeadOne() { public List<List<String>> persionHeadOne() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a="职 工 社 会 保 险 增 加 花 名 册"; String a = "职 工 社 会 保 险 增 加 花 名 册";
//第一列-第十八列 //第一列-第十八列
for (int i =1;i<= 18;i++) { for (int i = 1; i <= 18; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> persionHeadTwo(String houseName,String cusNo) { public List<List<String>> persionHeadTwo(String houseName, String cusNo) {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a="单位名称(签章): " + houseName + " 单位编码:" + (null == cusNo ? " " : cusNo); String a = "单位名称(签章): " + houseName + " 单位编码:" + (null == cusNo ? " " : cusNo);
//第一列-第十八列 //第一列-第十八列
for (int i =1;i<= 18;i++) { for (int i = 1; i <= 18; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/21 * @Date 09:05 2023/7/21
* @return
*/ */
public List<List<String>> persionHead() { public List<List<String>> persionHead() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String c="参加保险险种"; String c = "参加保险险种";
//第一列 //第一列
list.add( Lists.newArrayList("序号","序号")); list.add(Lists.newArrayList("序号", "序号"));
//第二列 //第二列
list.add( Lists.newArrayList("姓名","姓名")); list.add(Lists.newArrayList("姓名", "姓名"));
//第三列 //第三列
list.add( Lists.newArrayList("职工编码","职工编码")); list.add(Lists.newArrayList("职工编码", "职工编码"));
//第四列 //第四列
list.add( Lists.newArrayList("社会保障号码 (身份证号码)","社会保障号码 (身份证号码)")); list.add(Lists.newArrayList("社会保障号码 (身份证号码)", "社会保障号码 (身份证号码)"));
//第五列 //第五列
list.add( Lists.newArrayList("性别","性别")); list.add(Lists.newArrayList("性别", "性别"));
//第六列 //第六列
list.add( Lists.newArrayList("民族","民族")); list.add(Lists.newArrayList("民族", "民族"));
//第七列 //第七列
list.add( Lists.newArrayList("参加工作时间","参加工作时间")); list.add(Lists.newArrayList("参加工作时间", "参加工作时间"));
//第八列 //第八列
list.add( Lists.newArrayList("户口性质","户口性质")); list.add(Lists.newArrayList("户口性质", "户口性质"));
//第九列 //第九列
list.add( Lists.newArrayList("个人身份","个人身份")); list.add(Lists.newArrayList("个人身份", "个人身份"));
//参加保险险种 //参加保险险种
List<String> orderSpeaces = Lists.newArrayList("养老","失业","医疗","工伤","生育"); List<String> orderSpeaces = Lists.newArrayList("养老", "失业", "医疗", "工伤", "生育");
orderSpeaces.forEach(e->{ orderSpeaces.forEach(e -> {
list.add( Lists.newArrayList(c,e) ); list.add(Lists.newArrayList(c, e));
}); });
//第十五列 //第十五列
list.add( Lists.newArrayList("月工资收入(元)","月工资收入(元)")); list.add(Lists.newArrayList("月工资收入(元)", "月工资收入(元)"));
//第十六列 //第十六列
list.add( Lists.newArrayList("补缴保险属期","补缴保险属期")); list.add(Lists.newArrayList("补缴保险属期", "补缴保险属期"));
//第十七列 //第十七列
list.add( Lists.newArrayList("户籍所在地","户籍所在地")); list.add(Lists.newArrayList("户籍所在地", "户籍所在地"));
//第十八列 //第十八列
list.add( Lists.newArrayList("备注","备注")); list.add(Lists.newArrayList("备注", "备注"));
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 11:12 2023/7/21 * @Date 11:12 2023/7/21
* @return
*/ */
public List<List<String>> persionHeadThree() { public List<List<String>> persionHeadThree() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
...@@ -1130,107 +1120,107 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -1130,107 +1120,107 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
"义务兵(含伤病残义务兵)、复员干部,“劳模级别”栏按下列类别填写:国家级、省(自治区、直辖市)级、部(委)级、地(市、厅、局)级、其他 \n" + "义务兵(含伤病残义务兵)、复员干部,“劳模级别”栏按下列类别填写:国家级、省(自治区、直辖市)级、部(委)级、地(市、厅、局)级、其他 \n" +
"7、本表需填制一式两份,经办机构审核盖章后方可有效,一份单位自存,一份报市社会保险经办机构。"; "7、本表需填制一式两份,经办机构审核盖章后方可有效,一份单位自存,一份报市社会保险经办机构。";
//第一列-第十八列 //第一列-第十八列
for (int i =1;i<= 18;i++) { for (int i = 1; i <= 18; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 11:12 2023/7/21 * @Date 11:12 2023/7/21
* @return
*/ */
public List<List<String>> persionHead1() { public List<List<String>> persionHead1() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String b="填表人: 单位联系电话: 社保经办机构审核人: " + "填报日期: " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日"; String b = "填表人: 单位联系电话: 社保经办机构审核人: " + "填报日期: " + DateUtil.getYear(DateUtil.getCurrentDateTime()) + " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) + " 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
//第一列-第十八列 //第一列-第十八列
for (int i =1;i<= 18;i++) { for (int i = 1; i <= 18; i++) {
list.add(Lists.newArrayList(b)); list.add(Lists.newArrayList(b));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> persionReduceHeadOne() { public List<List<String>> persionReduceHeadOne() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a="社 会 保 险 缴 费 单 位 人 员 减 少 花 名 册"; String a = "社 会 保 险 缴 费 单 位 人 员 减 少 花 名 册";
//第一列-第二十五列 //第一列-第二十五列
for (int i =1;i<= 25;i++) { for (int i = 1; i <= 25; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
* @return
*/ */
public List<List<String>> persionReduceHeadTwo(String houseName,String cusNo) { public List<List<String>> persionReduceHeadTwo(String houseName, String cusNo) {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a="单位名称(签章): " + houseName + " 单位编码:" + (null == cusNo ? " " : cusNo); String a = "单位名称(签章): " + houseName + " 单位编码:" + (null == cusNo ? " " : cusNo);
//第一列-第二十五列cusNo //第一列-第二十五列cusNo
for (int i =1;i<= 25;i++) { for (int i = 1; i <= 25; i++) {
list.add(Lists.newArrayList(a)); list.add(Lists.newArrayList(a));
} }
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 09:05 2023/7/21 * @Date 09:05 2023/7/21
* @return
*/ */
public List<List<String>> persionReduceHead() { public List<List<String>> persionReduceHead() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String c="减少原因"; String c = "减少原因";
//第一列 //第一列
list.add( Lists.newArrayList("序号","序号")); list.add(Lists.newArrayList("序号", "序号"));
//第二列 //第二列
list.add( Lists.newArrayList("职工编码","职工编码")); list.add(Lists.newArrayList("职工编码", "职工编码"));
//第三列 //第三列
list.add( Lists.newArrayList("姓名","姓名")); list.add(Lists.newArrayList("姓名", "姓名"));
//第四列 //第四列
list.add( Lists.newArrayList("社会保障号码 (身份证号码)","社会保障号码 (身份证号码)")); list.add(Lists.newArrayList("社会保障号码 (身份证号码)", "社会保障号码 (身份证号码)"));
//第五列 //第五列
list.add( Lists.newArrayList("停止缴费时间","停止缴费时间")); list.add(Lists.newArrayList("停止缴费时间", "停止缴费时间"));
//减少原因 //减少原因
List<String> orderSpeaces = Lists.newArrayList("辞职","辞退","参军","上学","劳改","劳教","除名","人员失踪","停薪留职","合同期满","解除合同","统筹内调出","调出统筹范围","退休","死亡","出国定居","港澳台定居","退保","其他"); List<String> orderSpeaces = Lists.newArrayList("辞职", "辞退", "参军", "上学", "劳改", "劳教", "除名", "人员失踪", "停薪留职", "合同期满", "解除合同", "统筹内调出", "调出统筹范围", "退休", "死亡", "出国定居", "港澳台定居", "退保", "其他");
orderSpeaces.forEach(e->{ orderSpeaces.forEach(e -> {
list.add( Lists.newArrayList(c,e) ); list.add(Lists.newArrayList(c, e));
}); });
list.add( Lists.newArrayList("备注","备注")); list.add(Lists.newArrayList("备注", "备注"));
return list; return list;
} }
/** /**
* @return
* @Author huyc * @Author huyc
* @Description 导出社保派单花名册 * @Description 导出社保派单花名册
* @Date 11:12 2023/7/21 * @Date 11:12 2023/7/21
* @return
*/ */
public List<List<String>> persionReduceHead1() { public List<List<String>> persionReduceHead1() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a = "说明1、“减少原因”栏可对应选项打“√”; \n" + String a = "说明1、“减少原因”栏可对应选项打“√”; \n" +
"2、本表需填制一式二份,经办机构审核盖章后方可有效,一份单位自存,一份报市社会保险经办机构。"; "2、本表需填制一式二份,经办机构审核盖章后方可有效,一份单位自存,一份报市社会保险经办机构。";
String b="填表人: 单位联系电话: 社保经办机构审核人: " + "填报日期: " + DateUtil.getYear(DateUtil.getCurrentDateTime())+ " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) +" 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日"; String b = "填表人: 单位联系电话: 社保经办机构审核人: " + "填报日期: " + DateUtil.getYear(DateUtil.getCurrentDateTime()) + " 年" + " " + DateUtil.getMonth(DateUtil.getCurrentDateTime()) + " 月" + " " + DateUtil.getDay(DateUtil.getCurrentDateTime()) + " 日";
//第一列-第十八列 //第一列-第十八列
for (int i =1;i<= 25;i++) { for (int i = 1; i <= 25; i++) {
list.add(Lists.newArrayList(a,b)); list.add(Lists.newArrayList(a, b));
} }
return list; return list;
} }
...@@ -1241,14 +1231,14 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -1241,14 +1231,14 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
* @Description 导出公积金派单花名册 * @Description 导出公积金派单花名册
* @Date 09:05 2023/7/19 * @Date 09:05 2023/7/19
*/ */
public List<List<String>> headSecond(String houseName,SocialHandleSearchVo searchVo) { public List<List<String>> headSecond(String houseName, SocialHandleSearchVo searchVo) {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
//表头数据 //表头数据
String a=null; String a = null;
if(houseName!=null) { if (houseName != null) {
HouseNameConfigVo vo = dispatchInfoMapper.getFundSumExportVoTwo(houseName, searchVo); HouseNameConfigVo vo = dispatchInfoMapper.getFundSumExportVoTwo(houseName, searchVo);
if (vo == null) { if (vo == null) {
a = "单位名称(签章): " + houseName + " 单位公积金账号:" + "" + " 单边缴纳比例:" + "" ; a = "单位名称(签章): " + houseName + " 单位公积金账号:" + "" + " 单边缴纳比例:" + "";
} else { } else {
if (vo.getCustomerNo() == null) { if (vo.getCustomerNo() == null) {
......
...@@ -236,7 +236,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -236,7 +236,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
updateSocial.setYgsHandleStatus(ygsHandleStatus); updateSocial.setYgsHandleStatus(ygsHandleStatus);
// 拉取审核结果,加日志 // 拉取审核结果,加日志
if (Common.isNotNull(ygsHandleStatus)) { if (Common.isNotNull(ygsHandleStatus)) {
socialLog = tSocialSoldierLogService.getSocialSoldierLog(socialInfo, "提交", "社保" socialLog = tSocialSoldierLogService.getSocialFriendLog(socialInfo, "提交", "社保"
, getStatusName(Integer.parseInt(ygsHandleStatus))); , getStatusName(Integer.parseInt(ygsHandleStatus)));
tSocialSoldierLogService.save(socialLog); tSocialSoldierLogService.save(socialLog);
} }
...@@ -309,7 +309,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -309,7 +309,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
// 拉取审核结果,加日志 // 拉取审核结果,加日志
if (Common.isNotNull(ysdHandleStatus)) { if (Common.isNotNull(ysdHandleStatus)) {
socialLog = tSocialSoldierLogService.getSocialSoldierLog(socialInfo, "提交", "医保" socialLog = tSocialSoldierLogService.getSocialFriendLog(socialInfo, "提交", "医保"
, getStatusName(Integer.parseInt(ysdHandleStatus))); , getStatusName(Integer.parseInt(ysdHandleStatus)));
tSocialSoldierLogService.save(socialLog); tSocialSoldierLogService.save(socialLog);
} }
......
...@@ -165,26 +165,26 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM ...@@ -165,26 +165,26 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM
} }
@Override @Override
public TSocialSoldierLog getYgsFriendLog(SociaFriendYgsAddVo vo, String type, String remark) { public TSocialSoldierLog getFriendLog(SociaFriendYgsAddVo vo, String type, String dispatchItem, String remark) {
TSocialSoldierLog log = new TSocialSoldierLog(); TSocialSoldierLog log = new TSocialSoldierLog();
log.setSocialId(vo.getSocialId()); log.setSocialId(vo.getSocialId());
log.setEmpName(vo.getEmpName()); log.setEmpName(vo.getEmpName());
log.setEmpIdcard(vo.getEmpIdcard()); log.setEmpIdcard(vo.getEmpIdcard());
log.setDispatchItem("社保"); log.setDispatchItem(dispatchItem);
log.setSocialHuName(vo.getSocialHouseholdName()); log.setSocialHuName(vo.getSocialHouseholdName());
// type 类型:提交;审核 // type 类型:提交;审核
log.setType(type); log.setType(type);
log.setRemark(remark); log.setRemark("【税友】" + remark);
return log; return log;
} }
@Override @Override
public TSocialSoldierLog getYsdFriendLog(SociaFriendYgsAddVo vo, String type, String remark) { public TSocialSoldierLog getYgsSoldierAuditLog(SocialSoldierYgsAuditVo vo, String type, String remark) {
TSocialSoldierLog log = new TSocialSoldierLog(); TSocialSoldierLog log = new TSocialSoldierLog();
log.setSocialId(vo.getSocialId()); log.setSocialId(vo.getSocialId());
log.setEmpName(vo.getEmpName()); log.setEmpName(vo.getEmpName());
log.setEmpIdcard(vo.getEmpIdcard()); log.setEmpIdcard(vo.getEmpIdcard());
log.setDispatchItem("保"); log.setDispatchItem("保");
log.setSocialHuName(vo.getSocialHouseholdName()); log.setSocialHuName(vo.getSocialHouseholdName());
// type 类型:提交;审核 // type 类型:提交;审核
log.setType(type); log.setType(type);
...@@ -193,12 +193,12 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM ...@@ -193,12 +193,12 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM
} }
@Override @Override
public TSocialSoldierLog getYgsSoldierAuditLog(SocialSoldierYgsAuditVo vo, String type, String remark) { public TSocialSoldierLog getYsdSoldierAuditLog(SocialSoldierYsdAuditVo vo, String type, String remark) {
TSocialSoldierLog log = new TSocialSoldierLog(); TSocialSoldierLog log = new TSocialSoldierLog();
log.setSocialId(vo.getSocialId()); log.setSocialId(vo.getSocialId());
log.setEmpName(vo.getEmpName()); log.setEmpName(vo.getEmpName());
log.setEmpIdcard(vo.getEmpIdcard()); log.setEmpIdcard(vo.getEmpIdcard());
log.setDispatchItem("保"); log.setDispatchItem("保");
log.setSocialHuName(vo.getSocialHouseholdName()); log.setSocialHuName(vo.getSocialHouseholdName());
// type 类型:提交;审核 // type 类型:提交;审核
log.setType(type); log.setType(type);
...@@ -207,16 +207,16 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM ...@@ -207,16 +207,16 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM
} }
@Override @Override
public TSocialSoldierLog getYsdSoldierAuditLog(SocialSoldierYsdAuditVo vo, String type, String remark) { public TSocialSoldierLog getSocialFriendLog(TSocialInfo social, String type, String dispatchItem, String remark) {
TSocialSoldierLog log = new TSocialSoldierLog(); TSocialSoldierLog log = new TSocialSoldierLog();
log.setSocialId(vo.getSocialId()); log.setSocialId(social.getId());
log.setEmpName(vo.getEmpName()); log.setEmpName(social.getEmpName());
log.setEmpIdcard(vo.getEmpIdcard()); log.setEmpIdcard(social.getEmpIdcard());
log.setDispatchItem("医保"); log.setDispatchItem(dispatchItem);
log.setSocialHuName(vo.getSocialHouseholdName()); log.setSocialHuName(social.getSocialHouseholdName());
// type 类型:提交;审核 // type 类型:提交;审核
log.setType(type); log.setType(type);
log.setRemark(remark); log.setRemark("【税友】" + remark);
return log; return log;
} }
......
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