diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index 734b9b270..f535b4ac0 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=3.0.3.2510.01 +version=3.0.4.2603.01 openFormulaForcedEditing=false \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202410090103.sql b/resource/sqlupgrade/PG/sql202410090103.sql index b1954e9d6..bf36ab6eb 100644 --- a/resource/sqlupgrade/PG/sql202410090103.sql +++ b/resource/sqlupgrade/PG/sql202410090103.sql @@ -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; -/ \ No newline at end of file +alter table hrsa_bill_detail add status varchar(200) NULL; \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarybill/SalaryBillItemNameMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryBillItemNameMapper.xml index d00b52f35..04668525f 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryBillItemNameMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryBillItemNameMapper.xml @@ -290,7 +290,7 @@ - WHEN id = #{item.id} THEN #{item.updateTime} + WHEN id = #{item.id} THEN #{item.updateTime,jdbcType=TIMESTAMP} diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml index bde24704a..2e5797503 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml @@ -370,7 +370,7 @@ - WHEN id = #{item.id} THEN #{item.updateTime} + WHEN id = #{item.id} THEN #{item.updateTime,jdbcType=TIMESTAMP} diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml index d42fc0d04..b870363f5 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml @@ -379,7 +379,33 @@ - WHEN id = #{item.id} THEN #{item.updateTime} + WHEN id = #{item.id} THEN #{item.updateTime,jdbcType=TIMESTAMP} + + + + + WHEN id = #{item.id} THEN #{item.deleteType} + + + + WHERE delete_type = 0 + AND id IN + + #{item.id} + + + + + UPDATE hrsa_insurance_base_info + + + + WHEN id = #{item.id} THEN #{item.runStatus} + + + + + WHEN id = #{item.id} THEN cast(#{item.updateTime} as timestamp)