Commit 9636635a authored by hongguangwu's avatar hongguangwu

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

parents db9b1c9d e022b74b
...@@ -3,11 +3,13 @@ package com.yifu.cloud.plus.v1.yifu.archives.service.impl; ...@@ -3,11 +3,13 @@ package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.check.entity.TCheckMobile;
import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo; import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper;
...@@ -25,11 +27,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.AliSmsResult; ...@@ -25,11 +27,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.AliSmsResult;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.RegistParamVo; import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.RegistParamVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.YiFuSmsUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.YiFuSmsUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.CspDaprUtils; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
...@@ -64,7 +64,7 @@ import java.util.*; ...@@ -64,7 +64,7 @@ import java.util.*;
@Log4j2 @Log4j2
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@EnableConfigurationProperties(DaprInsurancesProperties.class) @EnableConfigurationProperties({DaprInsurancesProperties.class,DaprCheckProperties.class})
public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegistrationPreMapper, EmployeeRegistrationPre> implements EmployeeRegistrationPreService { public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegistrationPreMapper, EmployeeRegistrationPre> implements EmployeeRegistrationPreService {
private final DaprInsurancesProperties daprInsurancesProperties; private final DaprInsurancesProperties daprInsurancesProperties;
...@@ -78,6 +78,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -78,6 +78,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
@Autowired @Autowired
private OSSUtil ossUtil; private OSSUtil ossUtil;
@Autowired
private DaprCheckProperties daprCheckProperties;
private final TEmployeePreLogService tEmployeePreLogService; private final TEmployeePreLogService tEmployeePreLogService;
private final TCompleteMonitorMapper completeMonitorMapper; private final TCompleteMonitorMapper completeMonitorMapper;
...@@ -460,6 +463,31 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -460,6 +463,31 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (Common.isEmpty(id)) { if (Common.isEmpty(id)) {
return R.failed("请传ID"); return R.failed("请传ID");
} }
YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user) || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
//旧的对象,用来对比变更参数
EmployeeRegistrationPre comparePre = baseMapper.selectById(id);
if (Common.isEmpty(comparePre)) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
//1.9.11 huyc 信息修改手机号真实性校验
if (Common.isNotNull(employeeRegistrationPre.getEmpPhone()) &&
!employeeRegistrationPre.getEmpPhone().equals(comparePre.getEmpPhone())) {
//手机号真实性校验
TCheckMobile checkMobile = new TCheckMobile();
checkMobile.setMobile(employeeRegistrationPre.getEmpPhone());
R<TCheckMobile> res = HttpDaprUtil.invokeMethodPost(daprCheckProperties.getAppUrl(),daprCheckProperties.getAppId(),"/tcheckmobile/inner/checkOneMobile", JSON.toJSONString(checkMobile), TCheckMobile.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res) || Common.isEmpty(res.getData())){
return R.failed("校验手机号码信息失败!");
}
TCheckMobile cm = res.getData();
if (Common.isEmpty(cm.getStatus()) || !CommonConstants.ONE_STRING.equals(cm.getStatus())){
return R.failed(cm.getMessage());
}
}
// 检查附件ID列表是否不为空、更新附件 // 检查附件ID列表是否不为空、更新附件
if (Common.isNotNull(employeeRegistrationPre.getAttaIdList())) { if (Common.isNotNull(employeeRegistrationPre.getAttaIdList())) {
// 创建更新条件构造器 // 创建更新条件构造器
...@@ -481,15 +509,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -481,15 +509,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
attaInfoService.updateById(atta); attaInfoService.updateById(atta);
} }
} }
YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user) || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
//旧的对象,用来对比变更参数
EmployeeRegistrationPre comparePre = baseMapper.selectById(id);
if (Common.isEmpty(comparePre)) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
Map<String, TEmployeeInsurancePre> oldMap = new HashMap<>(); Map<String, TEmployeeInsurancePre> oldMap = new HashMap<>();
// 查原商险,来对比 // 查原商险,来对比
...@@ -1208,7 +1227,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -1208,7 +1227,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
URL url; URL url;
for (TAttaInfo a: attaInfo) { for (TAttaInfo a: attaInfo) {
url = ossUtil.getObjectUrl(null, a.getAttaSrc()); url = ossUtil.getObjectUrl(null, a.getAttaSrc());
a.setAttaUrl(url.toString()); a.setAttaUrl(null != url ? url.toString(): "");
} }
pre.setAttaList(attaInfo); pre.setAttaList(attaInfo);
} }
......
...@@ -309,7 +309,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -309,7 +309,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
List<TEmployeePreLogDetail> detailList = new ArrayList<>(); List<TEmployeePreLogDetail> detailList = new ArrayList<>();
// 档案信息修改 // 档案信息修改
TEmployeePreLogDetail detailEmpLog = null; TEmployeePreLogDetail detailEmpLog = null;
if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey)) { //1.9.11 huych 附件类型不比较差异
differenceKey = differenceKey.replace("attaIdList","");
differenceKey = differenceKey.replace("attaList","");
if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey)
&& !"attaIdList".equals(differenceKey)) {
differenceKey = differenceKey.replace("insurancePreList",""); differenceKey = differenceKey.replace("insurancePreList","");
diffTitle = "档案信息二次确认"; diffTitle = "档案信息二次确认";
detailEmpLog = new TEmployeePreLogDetail(); detailEmpLog = new TEmployeePreLogDetail();
......
...@@ -1286,9 +1286,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1286,9 +1286,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
TAttaInfoSaveVo attaInfo = new TAttaInfoSaveVo(); TAttaInfoSaveVo attaInfo = new TAttaInfoSaveVo();
BeanUtils.copyProperties(cspAttaInfo,attaInfo); BeanUtils.copyProperties(cspAttaInfo,attaInfo);
if (CommonConstants.ONE_STRING.equals(cspAttaInfo.getRelationType())) { if (CommonConstants.ONE_STRING.equals(cspAttaInfo.getRelationType())) {
attaInfo.setRelationType("30");
} else if (CommonConstants.TWO_STRING.equals(cspAttaInfo.getRelationType())) {
attaInfo.setRelationType("31"); attaInfo.setRelationType("31");
} else if (CommonConstants.TWO_STRING.equals(cspAttaInfo.getRelationType())) {
attaInfo.setRelationType("32");
} }
attaInfo.setDomainId(preVo.getId()); attaInfo.setDomainId(preVo.getId());
attaInfos.add(attaInfo); attaInfos.add(attaInfo);
...@@ -1459,7 +1459,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1459,7 +1459,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
*/ */
private void updateFileId(EmployeeRegistration registration) { private void updateFileId(EmployeeRegistration registration) {
// 检查附件ID列表是否不为空 // 检查附件ID列表是否不为空
if (Common.isNotNull(registration.getAttaIdList())) { if (Common.isNotNull(registration.getAttaIdList()) && !registration.getAttaIdList().isEmpty()) {
// 创建更新条件构造器 // 创建更新条件构造器
LambdaUpdateWrapper<TCspAttaInfo> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TCspAttaInfo> updateWrapper = new LambdaUpdateWrapper<>();
// 设置更新条件和新值 // 设置更新条件和新值
...@@ -1474,9 +1474,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1474,9 +1474,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
// 根据ID获取附件信息 // 根据ID获取附件信息
atta = tAttaInfoService.getById(id); atta = tAttaInfoService.getById(id);
// 更新附件的域名ID为当前员工的注册ID // 更新附件的域名ID为当前员工的注册ID
atta.setDomainId(registration.getId()); if (Common.isNotNull(atta)) {
// 保存更新后的附件信息 atta.setDomainId(registration.getId());
tAttaInfoService.updateById(atta); // 保存更新后的附件信息
tAttaInfoService.updateById(atta);
}
} }
} }
} }
......
...@@ -91,7 +91,7 @@ public class EkpBankAtta { ...@@ -91,7 +91,7 @@ public class EkpBankAtta {
@ExcelProperty("链接ID") @ExcelProperty("链接ID")
private String fdLinkId; private String fdLinkId;
/** /**
* 类型:1:银企付款主表;2:银企付款明细表 * 类型:1:银企付款主表;2:银企付款明细表 3:银企付款回单
*/ */
@ExcelAttribute(name = "类型") @ExcelAttribute(name = "类型")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
......
...@@ -136,9 +136,16 @@ public class IcbcTransactionFlowIssueController { ...@@ -136,9 +136,16 @@ public class IcbcTransactionFlowIssueController {
return icbcTransactionFlowIssueService.doGetEkpBankStatus(); return icbcTransactionFlowIssueService.doGetEkpBankStatus();
} }
@Operation(summary = "获取回单文件", description = "获取回单文件") @Operation(summary = "定时任务获取回单文件", description = "定时任务获取回单文件")
@Inner
@PostMapping("/inner/getPdfFile")
public R getPdfFile() {
return icbcTransactionFlowIssueService.getPdfFile();
}
@Operation(summary = "定时任务获取回单文件", description = "定时任务获取回单文件")
@PostMapping("/getPdfFile") @PostMapping("/getPdfFile")
public void getPdfFile() { public R getPdfFileTest() {
icbcTransactionFlowIssueService.getPdfFile(); return icbcTransactionFlowIssueService.getPdfFile();
} }
} }
...@@ -75,6 +75,6 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo> ...@@ -75,6 +75,6 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo>
**/ **/
R<String> doGetEkpBankStatus(); R<String> doGetEkpBankStatus();
void getPdfFile(); R getPdfFile();
} }
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
...@@ -60,5 +60,16 @@ public class EkpTask { ...@@ -60,5 +60,16 @@ public class EkpTask {
log.info("------------每小时获取银企付款结果-定时任务结束------------"); log.info("------------每小时获取银企付款结果-定时任务结束------------");
} }
/**
* @Author huyc
* @Description 生成昨日的回单文件
* @Date 2025-5-19 15:21:28
* @Param
* @return
**/
public void doCreateYesterdayPdfFile() {
log.info("------------定时生成生成昨日的回单文件-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprEkpProperties.getAppUrl(),daprEkpProperties.getAppId(),"/icbcIssue/inner/getPdfFile","", Object.class, SecurityConstants.FROM_IN);
log.info("------------定时生成生成昨日的回单文件-定时任务结束------------");
}
} }
\ No newline at end of file
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