diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 3912582c9..81a070f06 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -948,6 +948,8 @@ public class SIAccountBiz extends Service { baseParam.getProjects() == null ? new ArrayList<>() : baseParam.getProjects().stream().map(String::valueOf).collect(Collectors.toList()))); insuranceAccountDetailPO.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); insuranceAccountDetailPO.setResourceFrom(ResourceFromEnum.SYSTEM.getValue()); + //缴纳组织=个税扣缴义务人 + insuranceAccountDetailPO.setSocialPayOrg(baseParam.getPaymentOrganization()); if (projects.contains(ProjectTypeEnum.ALL.getValue())) { accountSocial(insuranceAccountDetailPO, accountPO); accountFund(insuranceAccountDetailPO, accountPO); diff --git a/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java b/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java index 64032f67a..11f250657 100644 --- a/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java +++ b/src/com/engine/salary/entity/siaccount/dto/InsuranceAccountViewListDTO.java @@ -3,7 +3,6 @@ package com.engine.salary.entity.siaccount.dto; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableOperate; import com.engine.salary.annotation.TableTitle; import lombok.AllArgsConstructor; import lombok.Builder; @@ -27,7 +26,7 @@ public class InsuranceAccountViewListDTO { @TableTitle(title = "序号", dataIndex = "index", key = "index") private Long index; - @TableTitle(title = "缴纳组织", dataIndex = "payOrg", key = "payOrg") + @TableTitle(title = "个税扣缴义务人", dataIndex = "payOrg", key = "payOrg") private String payOrg; @TableTitle(title = "社保人数", dataIndex = "socialNum", key = "socialNum") diff --git a/src/com/engine/salary/mapper/InsuranceExportMapper.xml b/src/com/engine/salary/mapper/InsuranceExportMapper.xml index 09e71bfee..4b0694c47 100644 --- a/src/com/engine/salary/mapper/InsuranceExportMapper.xml +++ b/src/com/engine/salary/mapper/InsuranceExportMapper.xml @@ -3,10 +3,10 @@