fix(气瓶):【现场问题】气瓶专项-液化石油气瓶-气瓶充装信息，气瓶充装企业上传充装记录后列表无法展示

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipRegistrationInfoMapper.java

@@ -46,6 +46,7 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis
             "  informationManageCode," +
             "  appId," +
             "  creditCode," +
+            "  fillingUnitName," +
             "  regionCode " +
             "FROM" +
             "  (" +
@@ -53,6 +54,7 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis
             "    CONCAT ( fi.\"PRODUCE_UNIT_CREDIT_CODE\", '-', fi.\"FACTORY_NUM\" ) AS sequenceCode," +
             "    fi.\"RECORD\" AS record," +
             "    ui.\"ESTATE_UNIT_NAME\" AS unitName," +
+            "    ui.\"USE_UNIT_NAME\" AS fillingUnitName," +
             "    fi.\"FACTORY_NUM\" AS factoryNum," +
             "    ri.\"EQU_DEFINE\" AS cylinderVariety," +
             "    ( SELECT NAME FROM tz_equipment_category WHERE code = ri.\"EQU_DEFINE\" ) AS cylinderVarietyName," +

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SyncCylinderDataService.java

@@ -26,10 +26,7 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Slf4j
 @Component
@@ -218,7 +215,10 @@ public class SyncCylinderDataService {
                     return;
                 }
                 item.setSequenceNbr(sequence.nextId());
-                item.setUnitName((String) cylUseInfo.get("unitName"));
+                item.setUnitName(Optional.ofNullable((String) cylUseInfo.get("unitName"))
+                                .orElse((String) cylUseInfo.get("fillingUnitName"))
+                );
+                item.setFillingUnitName(Objects.toString(cylUseInfo.get("fillingUnitName"), ""));
                 item.setFactoryNum((String) cylUseInfo.get("factoryNum"));
                 item.setCylinderVariety(Integer.valueOf((String) cylUseInfo.get("cylinderVariety")));
                 item.setCylinderVarietyName((String) cylUseInfo.get("cylinderVarietyName"));

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

@@ -324,7 +324,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFillingUnitName())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-            query.must(QueryBuilders.matchQuery("fillingUnitName", "*" + esCylinderFillingRecordDto.getFillingUnitName() + "*"));
+            query.must(QueryBuilders.matchPhraseQuery("fillingUnitName", "*" + esCylinderFillingRecordDto.getFillingUnitName() + "*"));
             boolMust.must(query);
         }
 
@@ -332,7 +332,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getUnitName())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-            query.must(QueryBuilders.matchQuery("unitName", "*" + esCylinderFillingRecordDto.getUnitName() + "*"));
+            query.must(QueryBuilders.matchPhraseQuery("unitName", "*" + esCylinderFillingRecordDto.getUnitName() + "*"));
             boolMust.must(query);
         }