feat: 薪资项目分权,修改落库

This commit is contained in:
fcli 2022-11-15 17:24:23 +08:00
parent 4bcd355254
commit f1bdd0ada9
3 changed files with 30 additions and 8 deletions

View File

@ -201,6 +201,12 @@
<if test="dataType != null">
data_type,
</if>
<if test="sharedType != null">
shared_type,
</if>
<if test="taxAgentIds != null">
tax_agent_ids,
</if>
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -260,6 +266,12 @@
<if test="dataType != null">
#{dataType},
</if>
<if test="sharedType != null">
#{sharedType},
</if>
<if test="taxAgentIds != null">
#{taxAgentIds},
</if>
</trim>
</insert>
@ -322,6 +334,12 @@
<if test="dataType != null">
data_type=#{dataType},
</if>
<if test="sharedType != null">
shared_type=#{sharedType},
</if>
<if test="taxAgentIds != null">
tax_agent_ids=#{taxAgentIds},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>
@ -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
<foreach collection="collection" item="item" separator=",">
(#{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})
</foreach>
</insert>
<insert id="batchInsert" databaseId="oracle">
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)
<foreach collection="collection" item="item" separator="union all">
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
</foreach>
</insert>
@ -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})
</foreach>
</insert>

View File

@ -20,8 +20,6 @@
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="data_type" property="dataType"/>
<result column="shared_type" property="sharedType"/>
<result column="tax_agent_ids" property="taxAgentIds"/>
</resultMap>
<!-- 表字段 -->

View File

@ -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<SalaryItemPO> loggerContext = new LoggerContext<>();