增加气瓶数据同步更新

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/mapper/CylinderFillingExamineMapper.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.cylinder.flc.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingExamine;
 
+import java.util.List;
+
 /**
  * 液化气体气瓶充装信息审核 Mapper 接口
  *
@@ -11,4 +13,5 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingExami
  */
 public interface CylinderFillingExamineMapper extends BaseMapper<CylinderFillingExamine> {
 
+  void saveOrUpdateBatch(List<CylinderFillingExamine> cylinderFillingExamineList);
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/mapper/CylinderInspectionMapper.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInspection;
 
+import java.util.List;
+
 /**
  * 气瓶检验信息 Mapper 接口
  *
@@ -15,4 +17,5 @@ public interface CylinderInspectionMapper extends BaseMapper<CylinderInspection>
 	
 	Page<CylinderInfo> queryOutOfDateCylinder(Page<CylinderInfo> pageBean, String appId);
 
+  void saveOrUpdateBatch(List<CylinderInspection> cylinderInspectionList);
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylCylinderFillingCheckMapper.xml

@@ -142,7 +142,7 @@
             LIMIT 1000
     </select>
     <insert id="saveAndBatchInsert">
-        INSERT INTO "amos_tzs_biz"."tz_cylinder_filling"
+        INSERT INTO "tz_cylinder_filling"
              (
         sequence_nbr,
         filling_before_id,

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderFillingExamineMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderFillingExamineMapper">
-
+  <insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingExamine">
+    INSERT INTO "tz_cylinder_filling_examine"(sequence_nbr,filling_examine_id,filling_audit_date,filling_audit_url,filling_audit_name,rec_date,rec_user_id,sync_date,sync_state,app_id)
+    VALUES
+    <foreach collection="list" item="item" index="index" separator=",">
+      (#{item.sequenceNbr},
+      #{item.fillingExamineId},
+      #{item.fillingAuditDate},
+      #{item.fillingAuditUrl},
+      #{item.fillingAuditName},
+      #{item.recDate},
+      #{item.recUserId},
+      #{item.syncDate},
+      #{item.syncState},
+      #{item.appId})
+    </foreach>
+    on conflict (app_id,filling_examine_id) do update set
+    "filling_examine_id" = EXCLUDED."filling_examine_id",
+    "filling_audit_date" = EXCLUDED."filling_audit_date",
+    "filling_audit_url" = EXCLUDED."filling_audit_url",
+    "filling_audit_name" = EXCLUDED."filling_audit_name",
+    "rec_date" = EXCLUDED."rec_date",
+    "rec_user_id" = EXCLUDED."rec_user_id",
+    "sync_date" = EXCLUDED."sync_date",
+    "sync_state" = EXCLUDED."sync_state",
+    "app_id" = EXCLUDED."app_id"
+  </insert>
 </mapper>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderInspectionMapper.xml

@@ -12,4 +12,34 @@
 	     AND info.app_id = #{appId}
 
     </select>
+	<insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInspection">
+		INSERT INTO "tz_cylinder_inspection"(sequence_nbr,inspection_unit,sequence_code,inspection_date,next_inspection_date,inspection_result,rec_date,rec_user_id,sync_date,sync_state,app_id,scrap_quantity)
+		VALUES
+		<foreach collection="list" item="item" index="index" separator=",">
+			(#{item.sequenceNbr},
+			#{item.inspectionUnit},
+			#{item.sequenceCode},
+			#{item.inspectionDate},
+			#{item.nextInspectionDate},
+			#{item.inspectionResult},
+			#{item.recDate},
+			#{item.recUserId},
+			#{item.syncDate},
+			#{item.syncState},
+			#{item.appId}),
+			#{item.scrapQuantity})
+		</foreach>
+		on conflict (app_id,filling_examine_id) do update set
+		"inspection_unit" = EXCLUDED."inspection_unit",
+		"sequence_code" = EXCLUDED."sequence_code",
+		"inspection_date" = EXCLUDED."inspection_date",
+		"next_inspection_date" = EXCLUDED."next_inspection_date",
+		"inspection_result" = EXCLUDED."inspection_result",
+		"rec_date" = EXCLUDED."rec_date",
+		"rec_user_id" = EXCLUDED."rec_user_id",
+		"sync_date" = EXCLUDED."sync_date",
+		"sync_state" = EXCLUDED."sync_state",
+		"app_id" = EXCLUDED."app_id",
+		"scrap_quantity" = EXCLUDED."scrap_quantity"
+	</insert>
 </mapper>

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderUnitMapper.xml

@@ -66,7 +66,7 @@
         WHERE tcu.region_code like concat('%', #{regionCode}, '%')
     </select>
     <insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnit">
-        INSERT INTO "amos_tzs_biz"."tz_cylinder_unit"(sequence_nbr,unit_id,region_code,unit_name,credit_code,address,unit_person,person_mobile_phone,person_telephone,postal_code,rec_date,rec_user_id,sync_date,sync_state,app_id,security_adm,security_adm_phone,region_name)
+        INSERT INTO "tz_cylinder_unit"(sequence_nbr,unit_id,region_code,unit_name,credit_code,address,unit_person,person_mobile_phone,person_telephone,postal_code,rec_date,rec_user_id,sync_date,sync_state,app_id,security_adm,security_adm_phone,region_name)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.sequenceNbr},