From 5486d3f849e947c295193de5bcae9a09c7eace94 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 28 Nov 2022 16:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E7=A4=BE=E4=BF=9D=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siaccount/po/InsuranceCompensationConfigPO.java | 6 +++--- .../siaccount/InsuranceCompensationConfigMapper.java | 2 +- .../siaccount/InsuranceCompensationConfigMapper.xml | 8 ++++---- .../mapper/siaccount/InsuranceCompensationMapper.java | 2 +- .../mapper/siaccount/InsuranceCompensationMapper.xml | 9 ++++----- .../salary/service/impl/SICompensationServiceImpl.java | 4 ++-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationConfigPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationConfigPO.java index 7a64efe2e..7bf4e8a79 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationConfigPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationConfigPO.java @@ -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 diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.java index 211404c34..5aa6e5863 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.java +++ b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.java @@ -7,7 +7,7 @@ import java.util.Collection; public interface InsuranceCompensationConfigMapper { - void bathInsert(@Param("collection") Collection compensationConfigPOS); + void batchInsert(@Param("collection") Collection compensationConfigPOS); void insert(InsuranceCompensationConfigPO compensationConfigPO); diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.xml index d4a39d697..690d59f57 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationConfigMapper.xml @@ -31,7 +31,7 @@ , t.tenant_key - + INSERT INTO hrsa_compensation_config( id, employee_id, @@ -62,7 +62,7 @@ ) - + INSERT INTO hrsa_compensation_config( id, employee_id, @@ -94,7 +94,7 @@ from dual - + INSERT INTO hrsa_compensation_config( id, @@ -126,7 +126,7 @@ - + insert into hrsa_compensation_config ( id, employee_id, diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.java index 65015dc3d..c3aa3ee20 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.java +++ b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.java @@ -7,7 +7,7 @@ import java.util.Collection; public interface InsuranceCompensationMapper { - void bathInsert(@Param("collection") Collection insuranceCompensationPOS); + void batchInsert(@Param("collection") Collection insuranceCompensationPOS); void insert(InsuranceCompensationPO insuranceCompensationPO); diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.xml index 573e403d0..1dae2c343 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.xml @@ -40,7 +40,7 @@ , t.tenant_key - + INSERT INTO hrsa_compensation_log( id, employee_id, @@ -79,7 +79,7 @@ ) - + 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 - + INSERT INTO hrsa_compensation_log( id, @@ -159,7 +158,7 @@ - + insert into hrsa_compensation_log ( id, employee_id, diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java index 0491ecc45..a097da227 100644 --- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java @@ -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()))