Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -26,7 +26,7 @@
 			#{item.recUserId},
 			#{item.syncDate},
 			#{item.syncState},
-			#{item.appId}),
+			#{item.appId},
 			#{item.scrapQuantity})
 		</foreach>
 		on conflict (app_id,sequence_code) do update set

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

@@ -9,7 +9,7 @@
 
 
     <insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderTags">
-        INSERT INTO tz_cylinder_tags"(
+        INSERT INTO "tz_cylinder_tags"(
         sequence_nbr,
         sequence_code,
         qrcode,
@@ -44,7 +44,6 @@
         "sync_state" = EXCLUDED."sync_state",
         "app_id" = EXCLUDED."app_id",
         "integrity" = EXCLUDED."integrity",
-        "security_adm_phone" = EXCLUDED."security_adm_phone",
         "gas_cylinder_stamp" = EXCLUDED."gas_cylinder_stamp"
     </insert>
 

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -337,6 +337,14 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             boolMust.must(query);
         }
 
+        //应用id
+        if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getAppId())) {
+            flag = false;
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.termsQuery("appId",  esCylinderFillingRecordDto.getAppId().toLowerCase()));
+            boolMust.must(query);
+        }
+
         //匹配气瓶品种
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getCylinderVariety())) {
             flag = false;

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -908,14 +908,15 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             boolMust.should(appIdBuilder);
         }
 
-        //匹配appid
+        //应用id
         if (!ObjectUtils.isEmpty(cylinderInfoDto.getAppId())) {
             flag = false;
-            BoolQueryBuilder appIdBuilder = QueryBuilders.boolQuery();
-            appIdBuilder.must(QueryBuilders.matchQuery("appId", "*" + cylinderInfoDto.getAppId() + "*"));
-            boolMust.should(appIdBuilder);
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.termsQuery("appId",  cylinderInfoDto.getAppId().toLowerCase()));
+            boolMust.must(query);
         }
 
+
         //匹配产权单位
         if (!ObjectUtils.isEmpty(cylinderInfoDto.getUnitName())) {
             flag = false;