Commit 8414666c authored by hongguangwu's avatar hongguangwu

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

parents 7393025a c7e0a529
......@@ -488,16 +488,15 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
// 创建更新条件构造器
LambdaUpdateWrapper<TAttaInfo> updateWrapper = new LambdaUpdateWrapper<>();
// 设置更新条件和新值
updateWrapper.eq(TAttaInfo::getDomainId, employeeRegistrationPre.getId())
.set(TAttaInfo::getDomainId, CommonConstants.EMPTY_STRING);
// 执行更新操作,清空附件的域名ID
attaInfoService.update(updateWrapper);
// 检查附件ID列表是否不为空、更新附件
if (Common.isNotNull(employeeRegistrationPre.getAttaIdList())) {
// 创建更新条件构造器
LambdaUpdateWrapper<TAttaInfo> updateWrapper = new LambdaUpdateWrapper<>();
// 设置更新条件和新值
updateWrapper.eq(TAttaInfo::getDomainId, employeeRegistrationPre.getId())
.set(TAttaInfo::getDomainId, CommonConstants.EMPTY_STRING);
// 执行更新操作,清空附件的域名ID
attaInfoService.update(updateWrapper);
// 遍历员工注册记录中的附件ID列表
TAttaInfo atta;
for (String attaId : employeeRegistrationPre.getAttaIdList()) {
......
......@@ -1458,16 +1458,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
* @param registration 员工注册对象,包含附件ID列表
*/
private void updateFileId(EmployeeRegistration registration) {
// 创建更新条件构造器
LambdaUpdateWrapper<TCspAttaInfo> updateWrapper = new LambdaUpdateWrapper<>();
// 设置更新条件和新值
updateWrapper.eq(TCspAttaInfo::getDomainId, registration.getId())
.set(TCspAttaInfo::getDomainId, CommonConstants.EMPTY_STRING);
// 执行更新操作,清空附件的域名ID
tAttaInfoService.update(updateWrapper);
// 检查附件ID列表是否不为空
if (Common.isNotNull(registration.getAttaIdList()) && !registration.getAttaIdList().isEmpty()) {
// 创建更新条件构造器
LambdaUpdateWrapper<TCspAttaInfo> updateWrapper = new LambdaUpdateWrapper<>();
// 设置更新条件和新值
updateWrapper.eq(TCspAttaInfo::getDomainId, registration.getId())
.set(TCspAttaInfo::getDomainId, CommonConstants.EMPTY_STRING);
// 执行更新操作,清空附件的域名ID
tAttaInfoService.update(updateWrapper);
// 遍历员工注册记录中的附件ID列表
TCspAttaInfo atta;
for (String id : registration.getAttaIdList()) {
......
......@@ -144,7 +144,7 @@ public class IcbcTransactionFlowIssueController {
}
@Operation(summary = "定时任务获取回单文件", description = "定时任务获取回单文件")
@PostMapping("/getPdfFile")
@PostMapping("/getTestPdfFile")
public R getPdfFileTest() {
return icbcTransactionFlowIssueService.getPdfFile();
}
......
......@@ -1060,6 +1060,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
//String privateKeyPath = "D:/icbcFile/icbc"; // 替换为你的私钥路径
//E:\IdeaProjects\yifu_mvp\yifu-ekp\yifu-ekp-biz\src\main\resources\icbc\icbc
String privateKeyPath = System.getProperty("user.dir") + "/yifu-ekp/yifu-ekp-biz/src/main/resources/icbc/icbc"; // 远程目录路径
log.info("秘钥文件目录: " + privateKeyPath);
// 远程目录路径
String remoteDir = "/JFTStatementDownload/download";
Session session = null;
......
......@@ -54,4 +54,11 @@ public class InsuranceSearchVo extends TBusinessInsuranceVo{
*/
@Schema(description = "消息提醒人ID")
private String alertId;
/**
* 项目权限NO
*/
@Schema(description = "项目权限ID")
private List<String> settleDomainIds;
}
......@@ -7948,13 +7948,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, InsuranceSearchVo condition) {
YifuUser user = SecurityUtils.getUser();
long roleId = 1851541100126863362L;
long roleId2 = 202505261018111L;
boolean isSsc = this.haveRole(user, roleId);
boolean isProjectManager = this.haveRole(user, roleId2);
if (isSsc) {
condition.setAlertId(null);
} else {
} else if (isProjectManager){
condition.setAlertId(null);
}else{
condition.setAlertId(user.getId());
}
// R<TSettleDomainListVo> sdRes = archivesDaprUtil.getPermissionByUserId(user.getId());
if (isProjectManager){
R<TSettleDomainListVo> sdRes = archivesDaprUtil.getSettleDomainIdsByUserId(user.getId());
if (Common.isNotNull(sdRes)){
condition.setSettleDomainIds(sdRes.getData().getDeptNos());
}
}
// List<TInsuranceAreaRes> areaRes = insuranceAreaResMapper.selectList(Wrappers.<TInsuranceAreaRes>query().lambda()
// .eq(TInsuranceAreaRes::getUserId, user.getId()).eq(TInsuranceAreaRes::getStatus, CommonConstants.ZERO_STRING));
// if (Common.isNotNull(areaRes)) {
......
......@@ -1867,6 +1867,13 @@
#{param}
</foreach>
</if>
<if test="param.settleDomainIds != null and param.settleDomainIds.size() > 0">
and a.DEPT_NO in
<foreach collection="param.settleDomainIds" item="param" index="index" open="(" close=")"
separator=",">
#{param}
</foreach>
</if>
</if>
</where>
......
......@@ -305,7 +305,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
// 分批查询和写入
if (count > CommonConstants.ZERO_INT) {
int batchSize = CommonConstants.EXCEL_EXPORT_LIMIT_1;
int batchSize = 100000;
int totalPages = (int) Math.ceil((double) count / batchSize);
List<SalaryAccountExportVo> batchList;
for (int page = 1; page <= totalPages; page++) {
......
......@@ -1790,7 +1790,7 @@
a.BANK_SUB_NAME,
case a.FORM_TYPE when '0' then '薪资' when '1' then '绩效' when '3' then '劳务费' when '4' then '稿酬' else '其他' end as FORM_TYPE,
a.SALARY_MONTH,
if(a.RELAY_SALARY_UNIT is not null and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,ifnull(a.RELAY_SALARY,0)) RELAY_SALARY,
if(ifnull(a.RELAY_SALARY_UNIT,-1) != -1 and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,ifnull(a.RELAY_SALARY,0)) RELAY_SALARY,
a.ACTUAL_SALARY,a.SALARY_TAX
FROM
<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'">
......
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