qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪酬系统-福利台账，社保调差字段类型调整

This commit is contained in:
sy 2022-11-28 16:25:52 +08:00
parent d9c7a6c0e3
commit 5486d3f849
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/siaccount/po/InsuranceCompensationConfigPO.java
View File

@ -5,7 +5,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
import java.util.Date;
/**
* @Author: sy
@ -46,12 +46,12 @@ public class InsuranceCompensationConfigPO {
/**
* 创建时间
*/
private LocalDateTime createTime;
private Date createTime;
/**
* 更新时间
*/
private LocalDateTime updateTime;
private Date updateTime;
/**
* 租户key

2
src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.java
View File

@ -7,7 +7,7 @@ import java.util.Collection;
public interface InsuranceCompensationConfigMapper {
void bathInsert(@Param("collection") Collection<InsuranceCompensationConfigPO> compensationConfigPOS);
void batchInsert(@Param("collection") Collection<InsuranceCompensationConfigPO> compensationConfigPOS);
void insert(InsuranceCompensationConfigPO compensationConfigPO);

8
src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.xml
View File

@ -31,7 +31,7 @@
, t.tenant_key
</sql>
<insert id="bathInsert">
<insert id="batchInsert">
INSERT INTO hrsa_compensation_config(
id,
employee_id,
@ -62,7 +62,7 @@
)
</foreach>
</insert>
<insert id="bathInsert" databaseId="oracle">
<insert id="batchInsert" databaseId="oracle">
INSERT INTO hrsa_compensation_config(
id,
employee_id,
@ -94,7 +94,7 @@
from dual
</foreach>
</insert>
<insert id="bathInsert" databaseId="sqlserver">
<insert id="batchInsert" databaseId="sqlserver">
<foreach collection="collection" item="item" separator=";">
INSERT INTO hrsa_compensation_config(
id,
@ -126,7 +126,7 @@
</foreach>
</insert>
<insert id="insert">
<insert id="insert" parameterType="com.engine.salary.entity.siaccount.po.InsuranceCompensationConfigPO">
insert into hrsa_compensation_config (
id,
employee_id,

2
src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.java
View File

@ -7,7 +7,7 @@ import java.util.Collection;
public interface InsuranceCompensationMapper {
void bathInsert(@Param("collection") Collection<InsuranceCompensationPO> insuranceCompensationPOS);
void batchInsert(@Param("collection") Collection<InsuranceCompensationPO> insuranceCompensationPOS);
void insert(InsuranceCompensationPO insuranceCompensationPO);

9
src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.xml
View File

@ -40,7 +40,7 @@
, t.tenant_key
</sql>
<insert id="bathInsert">
<insert id="batchInsert">
INSERT INTO hrsa_compensation_log(
id,
employee_id,
@ -79,7 +79,7 @@
)
</foreach>
</insert>
<insert id="bathInsert" databaseId="oracle">
<insert id="batchInsert" databaseId="oracle">
INSERT INTO hrsa_compensation_log(
id,
employee_id,
@ -115,11 +115,10 @@
#{item.creator,jdbcType=DOUBLE},
#{item.deleteType,jdbcType=INTEGER},
#{item.tenantKey,jdbcType=VARCHAR}
from dual
</foreach>
</insert>
<insert id="bathInsert" databaseId="sqlserver">
<insert id="batchInsert" databaseId="sqlserver">
<foreach collection="collection" item="item" separator=";">
INSERT INTO hrsa_compensation_log(
id,
@ -159,7 +158,7 @@
</foreach>
</insert>
<insert id="insert">
<insert id="insert" parameterType="com.engine.salary.entity.siaccount.po.InsuranceCompensationPO">
insert into hrsa_compensation_log (
id,
employee_id,

4
src/com/engine/salary/service/impl/SICompensationServiceImpl.java
View File

@ -270,8 +270,8 @@ public class SICompensationServiceImpl extends Service implements SICompensation
.tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
.employeeId(insuranceAccountDetailPO.getEmployeeId())
.adjustTo(config.getAdjustTo())
.createTime(LocalDateTime.now())
.updateTime(LocalDateTime.now())
.createTime(new Date())
.updateTime(new Date())
.categoryType(config.getCategoryType())
.paymentOrganization(config.getPaymentOrganization())
.welfareType(Integer.valueOf(config.getWelfareType()))