Merge branch 'release/3.0.2.2504.01' into custom/宁波百川港通国际物流有限公司

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

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;
-/
+alter table hrsa_bill_detail add status varchar(200) NULL;

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>

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>

src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml

@@ -379,7 +379,33 @@
             </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,">
+                <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="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,">