From af0344662886cb7aa3184764cb3d9cc6027fb316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 28 Jan 2026 13:48:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E4=BA=91=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=20=E5=8F=96=E6=B6=88=EF=BC=9A=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99=E2=80=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E2=80=9D=EF=BC=88=E5=8E=9F=E2=80=9C=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8/=E9=9D=9E=E6=AD=A3=E5=B8=B8=E2=80=9D=E9=80=89?= =?UTF-8?q?=E9=A1=B9=EF=BC=89=EF=BC=9B=20=E6=96=B0=E5=A2=9E=EF=BC=9A?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=A6=BB=E8=81=8C=E5=90=8E=E8=A1=A5=E5=8F=91?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=EF=BC=9A=E5=91=98=E5=B7=A5=E6=9C=89=E7=A6=BB?= =?UTF-8?q?=E8=81=8C=E6=97=A5=E6=9C=9F=E6=97=B6=E5=8F=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E2=80=9C=E6=98=AF/=E5=90=A6=E2=80=9D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/EmployeeDeclareExcelServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java index a9a9e2a8f..e1a88f6f6 100644 --- a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java @@ -141,7 +141,6 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee InputStream fileInputStream = null; try { - fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(param.getImageId())); Sheet sheet = ExcelSupport.parseFile(fileInputStream, 0, EXCEL_TYPE_XLSX); From dee1ed1b9c884119bdadf13fdcd7d64dd39c25c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 2 Feb 2026 15:17:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E4=BA=91=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../employeedeclare/bo/EmployeeDeclareRequest.java | 4 ++-- .../mapper/salaryacct/SalaryAcctEmployeeMapper.xml | 4 ++-- .../taxdeclaration/TaxDeclarationValueMapper.xml | 4 ++-- .../impl/SalaryAcctEmployeeServiceImpl.java | 11 ----------- .../impl/TaxDeclareEmployeeServiceImpl.java | 14 ++++---------- 5 files changed, 10 insertions(+), 27 deletions(-) diff --git a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java index 9aa58b539..60bba2281 100644 --- a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java +++ b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java @@ -76,8 +76,8 @@ public class EmployeeDeclareRequest { // 离职日期 employeeInfoMap.put("lzrq", SalaryDateUtil.getFormatLocalDate(employeeDeclare.getDismissDate())); //是否离职后补发工资 - SalaryOnOffEnum reissueSalary = SalaryEnumUtil.enumMatchByValue(employeeDeclare.getReissueSalary(), SalaryOnOffEnum.class); - employeeInfoMap.put("sflzhbfgz", reissueSalary == null ? "" : reissueSalary.getDefaultLabel()); + SalaryOnOffEnum reissueSalary = employeeDeclare.getReissueSalary() == null ? SalaryOnOffEnum.OFF : SalaryEnumUtil.enumMatchByValue(employeeDeclare.getReissueSalary(), SalaryOnOffEnum.class); + employeeInfoMap.put("sflzhbfgz", (reissueSalary != null && reissueSalary == SalaryOnOffEnum.ON) ? "是" : ""); //补发税款所属月份 employeeInfoMap.put("bfskssyf", SalaryDateUtil.getFormatYYYYMM(employeeDeclare.getReissueTaxCycle())); // 是否残疾 diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index 2640685f4..cd6d26811 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -1196,7 +1196,7 @@ AND hed.tax_agent_id = #{param.taxAgentId} AND hed.tax_cycle = #{param.taxCycle} AND hed.successfully_declared = 1 - AND (hed.employment_status = 0 OR hed.dismiss_date = ]]> #{param.taxCycle}) + AND (hed.dismiss_date is null OR hed.dismiss_date = ]]> #{param.taxCycle} OR hed.reissue_tax_cycle = #{param.taxCycle}) AND hed.declare_status IN (4) ) @@ -1214,7 +1214,7 @@ AND hed.tax_agent_id = #{param.taxAgentId} AND hed.tax_cycle = #{param.taxCycle} AND hed.successfully_declared = 1 - AND (hed.employment_status = 0 OR hed.dismiss_date = ]]> #{param.taxCycle}) + AND (hed.dismiss_date is null OR hed.dismiss_date = ]]> #{param.taxCycle} OR hed.reissue_tax_cycle = #{param.taxCycle}) AND hed.declare_status IN (4) ) diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml index e2954ff45..7744bcbad 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml @@ -411,7 +411,7 @@ AND hed.tax_agent_id = #{param.taxAgentId} AND hed.tax_cycle = #{param.taxCycle} AND hed.successfully_declared = 1 - AND (hed.employment_status = 0 OR hed.dismiss_date = ]]> #{param.taxCycle}) + AND (hed.dismiss_date is null OR hed.dismiss_date = ]]> #{param.taxCycle} OR hed.reissue_tax_cycle = #{param.taxCycle}) AND hed.declare_status IN (4) ) @@ -432,7 +432,7 @@ AND tax_agent_id = #{param.taxAgentId} AND tax_cycle = #{param.taxCycle} AND successfully_declared = 1 - AND employment_status = 0 + AND (dismiss_date is null OR dismiss_date = ]]> #{param.taxCycle} OR reissue_tax_cycle = #{param.taxCycle}) AND employee_id NOT IN ( SELECT employee_id FROM hrsa_tax_declaration_value htdv diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 6b29d01bb..06bb292fa 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -8,7 +8,6 @@ import com.engine.core.impl.Service; import com.engine.hrmelog.entity.dto.LoggerContext; import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.entity.datacollection.DataCollectionEmployee; -import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO; import com.engine.salary.entity.salaryacct.bo.SalaryAcctConfig; import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO; import com.engine.salary.entity.salaryacct.dto.AbnormalEmployeeListDTO; @@ -870,16 +869,6 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct queryParam.setTaxAgentId(sobPO.getTaxAgentId()); List list = getSalaryAcctEmployeeMapper().listPage4NotDeclareByParam(queryParam); - - if (CollUtil.isNotEmpty(list)) { - //补发逻辑 - List employeeDeclares = getEmployeeDeclareService(user).listReissueEmp(queryParam.getTaxAgentId(), queryParam.getTaxCycle()); - if(CollUtil.isNotEmpty(employeeDeclares)){ - Set empIds = SalaryEntityUtil.properties(employeeDeclares, EmployeeDeclarePO::getEmployeeId); - list = list.stream().filter(taxDeclarationValue -> !empIds.contains(taxDeclarationValue.getEmployeeId())).collect(Collectors.toList()); - } - } - return list; } diff --git a/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java index ea11d6a24..3367bc5e1 100644 --- a/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java @@ -1,6 +1,5 @@ package com.engine.salary.service.impl; -import cn.hutool.core.collection.CollUtil; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.entity.datacollection.DataCollectionEmployee; @@ -24,7 +23,10 @@ import com.engine.salary.util.page.SalaryPageUtil; import org.apache.commons.collections4.CollectionUtils; import weaver.hrm.User; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Set; import java.util.stream.Collectors; /** @@ -64,14 +66,6 @@ public class TaxDeclareEmployeeServiceImpl extends Service implements TaxDeclare public List list4NotDeclareByParam(AbnormalEmployeeListQueryParam queryParam) { //根据正常/非正常状态和离职日期查询是否有未报送的人员 List list = getTaxDeclarationValueMapper().list4NotDeclareByParam(queryParam); - if (CollUtil.isNotEmpty(list)) { - //补发逻辑 - List employeeDeclares = getEmployeeDeclareService(user).listReissueEmp(queryParam.getTaxAgentId(), queryParam.getTaxCycle()); - if(CollUtil.isNotEmpty(employeeDeclares)){ - Set empIds = SalaryEntityUtil.properties(employeeDeclares, EmployeeDeclarePO::getEmployeeId); - list = list.stream().filter(taxDeclarationValue -> !empIds.contains(taxDeclarationValue.getEmployeeId())).collect(Collectors.toList()); - } - } return list; }