Commit 6fac2c1f authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.15' into MVP1.7.15

parents 8f142964 77a8b7a0
...@@ -208,6 +208,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -208,6 +208,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
List<TSocialFriendBackLog> backLogList = new ArrayList<>(); List<TSocialFriendBackLog> backLogList = new ArrayList<>();
R<String> urlR; R<String> urlR;
List<SociaFriendYgsAddVo> listVo = new ArrayList<>(); List<SociaFriendYgsAddVo> listVo = new ArrayList<>();
// 花名册需要的list
List<SociaFriendYgsAddVo> huaListVo = new ArrayList<>();
List<TSocialSoldierLog> logTemp = new ArrayList<>(); List<TSocialSoldierLog> logTemp = new ArrayList<>();
List<TSocialInfo> socialInfoTemp = new ArrayList<>(); List<TSocialInfo> socialInfoTemp = new ArrayList<>();
List<TSocialInfo> socialInfoUpdate = new ArrayList<>(); List<TSocialInfo> socialInfoUpdate = new ArrayList<>();
...@@ -222,6 +224,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -222,6 +224,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean isSingle; boolean isSingle;
// 是否为生成解除劳动合同书 且是 派减 // 是否为生成解除劳动合同书 且是 派减
boolean isAutoLeaveDoc; boolean isAutoLeaveDoc;
// 社保是否自动生成花名册
boolean rosterAutoFlagYgs;
// 社保仅补缴生成材料 0否1是
boolean dataFlagYgs;
int nowMonth = Integer.parseInt(DateUtil.getThisMonth());
for (int index = 0 ; index < ygsAddlist.size(); index++) { for (int index = 0 ; index < ygsAddlist.size(); index++) {
vo = ygsAddlist.get(index); vo = ygsAddlist.get(index);
// 派减离职原因转化: // 派减离职原因转化:
...@@ -252,6 +259,24 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -252,6 +259,24 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo = new TSocialInfo(); socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
listVo.add(vo); listVo.add(vo);
// 仅补缴生成材料
dataFlagYgs = Common.isNotNull(vo.getDataFlagYgs())
&& CommonConstants.ONE_STRING.equals(vo.getDataFlagYgs())
&& Common.isNotNull(vo.getSocialStartMonth());
if (dataFlagYgs) {
// 仅补缴生成材料
try {
if (nowMonth >= Integer.parseInt(vo.getSocialStartMonth())) {
huaListVo.add(vo);
}
} catch (Exception e) {
huaListVo.add(vo);
}
} else {
huaListVo.add(vo);
}
socialInfoTemp.add(socialInfo); socialInfoTemp.add(socialInfo);
socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, dispatchItem, remark); socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, dispatchItem, remark);
if (socialLog != null) { if (socialLog != null) {
...@@ -267,12 +292,17 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -267,12 +292,17 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& CommonConstants.ONE_STRING.equals(vo.getIsAutoLeaveDoc()); && CommonConstants.ONE_STRING.equals(vo.getIsAutoLeaveDoc());
if (isAutoLeaveDoc || isSingle || nextFlag || i % 10 == 0 || index >= ygsAddlist.size()-1) { if (isAutoLeaveDoc || isSingle || nextFlag || i % 10 == 0 || index >= ygsAddlist.size()-1) {
urlR = doExportRosterNew(vo, type, listVo, zhangMap, templateSrcMap); rosterAutoFlagYgs = Common.isEmpty(vo.getRosterAutoFlagYgs()) || CommonConstants.ONE_STRING.equals(vo.getRosterAutoFlagYgs());
// 房工接口,获取 企业职工社会保险增员花名册 url if (rosterAutoFlagYgs && !huaListVo.isEmpty()) {
// urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo)
urlR = doExportRosterNew(vo, type, huaListVo, zhangMap, templateSrcMap);
// 房工接口,获取 企业职工基本医疗保险参保登记表 url
//urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo)
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());
} }
}
if (isSingle && Common.isNotNull(vo.getDispatchId())) { if (isSingle && Common.isNotNull(vo.getDispatchId())) {
// 获取单个附件并推送税友,返回 imgList 到Vo里 // 获取单个附件并推送税友,返回 imgList 到Vo里
...@@ -304,6 +334,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -304,6 +334,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} }
// 重置 // 重置
listVo = new ArrayList<>(); listVo = new ArrayList<>();
huaListVo = new ArrayList<>();
socialInfoTemp = new ArrayList<>(); socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>(); logTemp = new ArrayList<>();
} }
...@@ -465,6 +496,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -465,6 +496,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
R<String> urlR; R<String> urlR;
List<SociaFriendYgsAddVo> listVo = new ArrayList<>(); List<SociaFriendYgsAddVo> listVo = new ArrayList<>();
// 花名册需要的list
List<SociaFriendYgsAddVo> huaListVo = new ArrayList<>();
List<TSocialSoldierLog> logTemp = new ArrayList<>(); List<TSocialSoldierLog> logTemp = new ArrayList<>();
List<TSocialInfo> socialInfoTemp = new ArrayList<>(); List<TSocialInfo> socialInfoTemp = new ArrayList<>();
List<TSocialInfo> socialInfoUpdate = new ArrayList<>(); List<TSocialInfo> socialInfoUpdate = new ArrayList<>();
...@@ -479,6 +512,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -479,6 +512,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean isAutoLeaveDoc; boolean isAutoLeaveDoc;
// 是否为单个推送(派单审核时定性的) // 是否为单个推送(派单审核时定性的)
boolean isSingle; boolean isSingle;
// 社保是否自动生成花名册
boolean rosterAutoFlagYsd;
// 社保仅补缴生成材料 0否1是
boolean dataFlagYsd;
int nowMonth = Integer.parseInt(DateUtil.getThisMonth());
for (int index = 0 ; index < ysdAddlist.size(); index++) { for (int index = 0 ; index < ysdAddlist.size(); index++) {
vo = ysdAddlist.get(index); vo = ysdAddlist.get(index);
...@@ -506,7 +544,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -506,7 +544,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
remark = "超出医保离职原因的配置,转人工!配置为:"+vo.getTbyy(); remark = "超出医保离职原因的配置,转人工!配置为:"+vo.getTbyy();
socialInfo = new TSocialInfo(); socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
socialInfo.setYgsHandleStatus(CommonConstants.FIVE_STRING); socialInfo.setYsdHandleStatus(CommonConstants.FIVE_STRING);
renGongList.add(socialInfo); renGongList.add(socialInfo);
socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, dispatchItem, remark); socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, dispatchItem, remark);
if (socialLog != null) { if (socialLog != null) {
...@@ -521,6 +559,22 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -521,6 +559,22 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo = new TSocialInfo(); socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
listVo.add(vo); listVo.add(vo);
// 仅补缴生成材料
dataFlagYsd = Common.isNotNull(vo.getDataFlagYsd())
&& CommonConstants.ONE_STRING.equals(vo.getDataFlagYsd())
&& Common.isNotNull(vo.getSocialStartMonth());
if (dataFlagYsd) {
// 仅补缴生成材料
try {
if (nowMonth >= Integer.parseInt(vo.getSocialStartMonth())) {
huaListVo.add(vo);
}
} catch (Exception e) {
huaListVo.add(vo);
}
} else {
huaListVo.add(vo);
}
socialInfo = new TSocialInfo(); socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId()); socialInfo.setId(vo.getSocialId());
socialInfoTemp.add(socialInfo); socialInfoTemp.add(socialInfo);
...@@ -533,18 +587,23 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -533,18 +587,23 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) { && !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) {
nextFlag = true; nextFlag = true;
} }
isSingle = Common.isNotNull(vo.getIsSingle()) && CommonConstants.ONE_STRING.equals(vo.getIsSingle()); isSingle = Common.isNotNull(vo.getIsSingleYsd()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYsd());
isAutoLeaveDoc = templateUrl != null && type == 4 && Common.isNotNull(vo.getIsAutoLeaveDoc()) isAutoLeaveDoc = templateUrl != null && type == 4 && Common.isNotNull(vo.getIsAutoLeaveDoc())
&& CommonConstants.ONE_STRING.equals(vo.getIsAutoLeaveDoc()); && CommonConstants.ONE_STRING.equals(vo.getIsAutoLeaveDoc());
if (isAutoLeaveDoc || isSingle || nextFlag || i % 10 == 0 || index >= ysdAddlist.size()-1) { if (isAutoLeaveDoc || isSingle || nextFlag || i % 10 == 0 || index >= ysdAddlist.size()-1) {
urlR = doExportRosterNew(vo, type, listVo, zhangMap, templateSrcMap); rosterAutoFlagYsd = Common.isEmpty(vo.getRosterAutoFlagYsd()) || CommonConstants.ONE_STRING.equals(vo.getRosterAutoFlagYsd());
if (rosterAutoFlagYsd && !huaListVo.isEmpty()) {
urlR = doExportRosterNew(vo, type, huaListVo, zhangMap, templateSrcMap);
// 房工接口,获取 企业职工基本医疗保险参保登记表 url // 房工接口,获取 企业职工基本医疗保险参保登记表 url
//urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo); //urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo)
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());
} }
}
// 派减且是要自动生成离职证明: // 派减且是要自动生成离职证明:
if (isAutoLeaveDoc) { if (isAutoLeaveDoc) {
this.doSetAutoDoc(zhangMap, templateUrl, vo, CommonConstants.NINE_INTEGER); this.doSetAutoDoc(zhangMap, templateUrl, vo, CommonConstants.NINE_INTEGER);
...@@ -574,6 +633,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -574,6 +633,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} }
// 重置 // 重置
listVo = new ArrayList<>(); listVo = new ArrayList<>();
huaListVo = new ArrayList<>();
socialInfoTemp = new ArrayList<>(); socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>(); logTemp = new ArrayList<>();
} }
...@@ -1253,24 +1313,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -1253,24 +1313,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
backLog.setSocialId(vo.getSocialId()); backLog.setSocialId(vo.getSocialId());
backLog.setType(CommonConstants.SIX_INT); backLog.setType(CommonConstants.SIX_INT);
backLog.setCreateTime(LocalDateTime.now()); backLog.setCreateTime(LocalDateTime.now());
try { // 上传花名册到阿里云
String key = "socialFriend/" + vo.getSocialId() + "/" + System.currentTimeMillis() + fileName; this.uploadHuaMingCeToOss(vo, fileName, inputStreamOut);
ossUtil.uploadFileByStream(inputStreamOut, key, null);
TSocialFriendBackLog backLogFile = new TSocialFriendBackLog();
backLogFile.setSocialId(vo.getSocialId());
backLogFile.setType(19);
backLogFile.setCreateTime(LocalDateTime.now());
if (Common.isNotNull(key)) {
URL fileUrl = ossUtil.getObjectUrl(null, key);
if (Common.isNotNull(fileUrl)) {
key += fileUrl.toString();
}
}
backLogFile.setLogInfo(key);
tSocialFriendBackLogService.save(backLogFile);
} catch (Exception e) {
log.info("花名册上传到阿里云失败,查看文件使用,没有找税友要也行");
}
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;
...@@ -1291,6 +1335,36 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -1291,6 +1335,36 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
} }
} }
/**
* @param vo
* @param fileName
* @param inputStreamOut
* @Description: 上传花名册到阿里云
* @Author: hgw
* @Date: 2025/9/12 14:18
* @return: void
**/
private void uploadHuaMingCeToOss(SociaFriendYgsAddVo vo, String fileName, FileInputStream inputStreamOut) {
try {
String key = "socialFriend/" + vo.getSocialId() + "/" + System.currentTimeMillis() + fileName;
ossUtil.uploadFileByStream(inputStreamOut, key, null);
TSocialFriendBackLog backLogFile = new TSocialFriendBackLog();
backLogFile.setSocialId(vo.getSocialId());
backLogFile.setType(19);
backLogFile.setCreateTime(LocalDateTime.now());
if (Common.isNotNull(key)) {
URL fileUrl = ossUtil.getObjectUrl(null, key);
if (Common.isNotNull(fileUrl)) {
key += fileUrl.toString();
}
}
backLogFile.setLogInfo(key);
tSocialFriendBackLogService.save(backLogFile);
} catch (Exception e) {
log.info("花名册上传到阿里云失败,查看文件使用,没有找税友要也行");
}
}
/** /**
* 填充主表数据 * 填充主表数据
*/ */
......
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