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

Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

This commit is contained in:
钱涛 2026-03-27 16:52:12 +08:00
parent 7b4ab93f4b c2ee92cc42
commit 913ab9a0c3
4 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
resource/sqlupgrade/PG/sql202410090103.sql
View File

@ -1,54 +1,35 @@
alter table hrsa_bill_detail_temp add subcompany_name varchar2(200) NULL;
/
alter table hrsa_bill_detail_temp add subcompany_name varchar(200) NULL;
alter table hrsa_bill_detail_temp add subcompany_id NUMBER null;
/
alter table hrsa_bill_detail_temp add subcompany_id bigint null;
alter table hrsa_bill_detail_temp add department_name varchar2(200) NULL;
/
alter table hrsa_bill_detail_temp add department_name varchar(200) NULL;
alter table hrsa_bill_detail_temp add department_id NUMBER null;
/
alter table hrsa_bill_detail_temp add department_id bigint null;
alter table hrsa_bill_detail_temp add jobtitle_name varchar2(200) NULL;
/
alter table hrsa_bill_detail_temp add jobtitle_name varchar(200) NULL;
alter table hrsa_bill_detail_temp add jobtitle_id NUMBER NULL;
/
alter table hrsa_bill_detail_temp add jobtitle_id bigint NULL;
alter table hrsa_bill_detail_temp add jobcall varchar2(200) NULL;
/
alter table hrsa_bill_detail_temp add jobcall varchar(200) NULL;
alter table hrsa_bill_detail_temp add jobcall_id NUMBER NULL;
/
alter table hrsa_bill_detail_temp add jobcall_id bigint NULL;
alter table hrsa_bill_detail_temp add status varchar2(200) NULL;
/
alter table hrsa_bill_detail_temp add status varchar(200) NULL;
alter table hrsa_bill_detail add subcompany_name varchar(200) NULL;
alter table hrsa_bill_detail add subcompany_name varchar2(200) NULL;
/
alter table hrsa_bill_detail add subcompany_id bigint null;
alter table hrsa_bill_detail add subcompany_id NUMBER null;
/
alter table hrsa_bill_detail add department_name varchar(200) NULL;
alter table hrsa_bill_detail add department_name varchar2(200) NULL;
/
alter table hrsa_bill_detail add department_id bigint null;
alter table hrsa_bill_detail add department_id NUMBER null;
/
alter table hrsa_bill_detail add jobtitle_name varchar(200) NULL;
alter table hrsa_bill_detail add jobtitle_name varchar2(200) NULL;
/
alter table hrsa_bill_detail add jobtitle_id bigint NULL;
alter table hrsa_bill_detail add jobtitle_id NUMBER NULL;
/
alter table hrsa_bill_detail add jobcall varchar(200) NULL;
alter table hrsa_bill_detail add jobcall varchar2(200) NULL;
/
alter table hrsa_bill_detail add jobcall_id bigint NULL;
alter table hrsa_bill_detail add jobcall_id NUMBER NULL;
/
alter table hrsa_bill_detail add status varchar2(200) NULL;
/
alter table hrsa_bill_detail add status varchar(200) NULL;

2
src/com/engine/salary/mapper/salarybill/SalaryBillItemNameMapper.xml
View File

@ -290,7 +290,7 @@
</trim>
<trim prefix="update_time = case" suffix="end,">
<foreach collection="collection" item="item" index="index">
WHEN id = #{item.id} THEN #{item.updateTime}
WHEN id = #{item.id} THEN #{item.updateTime,jdbcType=TIMESTAMP}
</foreach>
</trim>
</trim>

2
src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml
View File

@ -370,7 +370,7 @@
</trim>
<trim prefix="update_time = case" suffix="end,">
<foreach collection="collection" item="item" index="index">
WHEN id = #{item.id} THEN #{item.updateTime}
WHEN id = #{item.id} THEN #{item.updateTime,jdbcType=TIMESTAMP}
</foreach>
</trim>
</trim>

2
src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
View File

@ -379,7 +379,7 @@
</trim>
<trim prefix="update_time = case" suffix="end,">
<foreach collection="collection" item="item" index="index">
WHEN id = #{item.id} THEN #{item.updateTime}
WHEN id = #{item.id} THEN #{item.updateTime,jdbcType=TIMESTAMP}
</foreach>
</trim>
<trim prefix="delete_type = case" suffix="end,">