diff --git a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml index 3ddbccb0b..94ed8b7ec 100644 --- a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml @@ -201,6 +201,12 @@ data_type, + + shared_type, + + + tax_agent_ids, + @@ -260,6 +266,12 @@ #{dataType}, + + #{sharedType}, + + + #{taxAgentIds}, + @@ -322,6 +334,12 @@ data_type=#{dataType}, + + shared_type=#{sharedType}, + + + tax_agent_ids=#{taxAgentIds}, + WHERE id = #{id} AND delete_type = 0 @@ -340,21 +358,22 @@ INSERT INTO hrsa_salary_item (id, name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time, - update_time, creator, delete_type, tenant_key, data_type) + update_time, creator, delete_type, tenant_key, data_type, shared_type, tax_agent_ids) VALUES (#{item.id},#{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId}, #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode}, #{item.pattern}, #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit}, - #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType}) + #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType}, + #{item.sharedType}, #{item.taxAgentIds}) INSERT INTO hrsa_salary_item (id,name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time, - update_time, creator, delete_type, tenant_key, data_type) + update_time, creator, delete_type, tenant_key, data_type, shared_type, tax_agent_ids) select @@ -376,7 +395,9 @@ #{item.creator,jdbcType=DOUBLE}, 0, #{item.tenantKey,jdbcType=VARCHAR}, - #{item.dataType,jdbcType=VARCHAR} + #{item.dataType,jdbcType=VARCHAR}, + #{item.sharedType,jdbcType=INTEGER}, + #{item.taxAgentIds,jdbcType=VARCHAR} from dual @@ -385,13 +406,14 @@ INSERT INTO hrsa_salary_item (id,name, code, system_type, sys_salary_item_id, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, formula_id, description, can_edit, create_time, - update_time, creator, delete_type, tenant_key, data_type) + update_time, creator, delete_type, tenant_key, data_type, shared_type, tax_agent_ids) VALUES (#{item.id},#{item.name}, #{item.code}, #{item.systemType}, #{item.sysSalaryItemId}, #{item.useDefault}, #{item.useInEmployeeSalary}, #{item.roundingMode}, #{item.pattern}, #{item.valueType}, #{item.formulaId}, #{item.description}, #{item.canEdit}, - #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType}) + #{item.createTime}, #{item.updateTime}, #{item.creator}, 0, #{item.tenantKey}, #{item.dataType}, + #{item.sharedType}, #{item.taxAgentIds}) diff --git a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml index c11b13ff7..9f189673c 100644 --- a/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SysSalaryItemMapper.xml @@ -20,8 +20,6 @@ - - diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 94bb71556..860496404 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -197,6 +197,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService newSalaryItemPO.setFormulaId(Objects.equals(saveParam.getValueType(), SalaryValueTypeEnum.INPUT.getValue()) ? 0L : saveParam.getFormulaId()); newSalaryItemPO.setDescription(saveParam.getDescription()); newSalaryItemPO.setUpdateTime(new Date()); + newSalaryItemPO.setSharedType(saveParam.getSharedType()); + newSalaryItemPO.setTaxAgentIds(saveParam.getTaxAgentIds()); salaryItemBiz.updateById(newSalaryItemPO); // 记录日志 // LoggerContext loggerContext = new LoggerContext<>();