From 3fe458f392e185dc06b3c0a447259b23cb9320f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 26 Mar 2026 16:22:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=84=E7=90=86pg=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sqlupgrade/PG/sql202410090103.sql | 55 +++++++---------------
 1 file changed, 18 insertions(+), 37 deletions(-)

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

From c2ee92cc42c08d913819ff3f61876095cc4a5997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 27 Mar 2026 16:51:32 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E7=90=86pg=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/salarybill/SalaryBillItemNameMapper.xml       | 2 +-
 .../engine/salary/mapper/salarysob/SalarySobEmpFieldMapper.xml  | 2 +-
 .../engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 @@
             </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>
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 @@
             </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>
diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
index 33ceb8af1..afc919f6c 100644
--- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
@@ -367,7 +367,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,">

From df53975ed776856a761859f4930e8adbbbccdac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 27 Mar 2026 16:54:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=84=E7=90=86pg=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/prop/hrmSalary.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 59c995f53d7a4a6f56be7b8246519b03e890e1d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 27 Mar 2026 17:44:31 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=84=E7=90=86pg=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siarchives/InsuranceBaseInfoMapper.xml    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
index 91c4638f3..b870363f5 100644
--- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml
@@ -395,6 +395,32 @@
         </foreach>
     </update>
 
+    <update id="batchUpdate" databaseId="postgresql">
+        UPDATE hrsa_insurance_base_info
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="run_status = case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    WHEN id = #{item.id} THEN #{item.runStatus}
+                </foreach>
+            </trim>
+            <trim prefix="update_time = case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    WHEN id = #{item.id} THEN cast(#{item.updateTime} as timestamp)
+                </foreach>
+            </trim>
+            <trim prefix="delete_type = case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    WHEN id = #{item.id} THEN #{item.deleteType}
+                </foreach>
+            </trim>
+        </trim>
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="collection" item="item" open="(" close=")" separator=",">
+            #{item.id}
+        </foreach>
+    </update>
+
     <update id="updateById" parameterType="com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO">
         UPDATE hrsa_insurance_base_info
         <set>