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," +
+            "  orgBranchCode," +
             "  fillingUnitName," +
             "  regionCode " +
             "FROM" +
@@ -62,12 +63,14 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis
             "    oi.\"INFORMATION_MANAGE_CODE\" AS informationManageCode," +
             "    ( SELECT app_id FROM tz_base_enterprise_info WHERE use_code = ( SELECT \"USE_UNIT_CREDIT_CODE\" FROM idx_biz_jg_use_info WHERE \"RECORD\" = fi.\"RECORD\" ) ) AS appId," +
             "    ui.\"USE_UNIT_CREDIT_CODE\" AS creditCode," +
+            "    si.\"ORG_BRANCH_CODE\" AS orgBranchCode," +
             "    ( SELECT ui.\"PROVINCE\" || '#' || ui.\"CITY\" || '#' || ui.\"COUNTY\" ) AS regionCode " +
             "  FROM" +
             "    idx_biz_jg_factory_info fi" +
             "    JOIN idx_biz_jg_other_info oi ON oi.\"RECORD\" = fi.\"RECORD\"" +
             "    JOIN idx_biz_jg_use_info ui ON ui.\"RECORD\" = fi.\"RECORD\"" +
             "    JOIN idx_biz_jg_register_info ri ON ri.\"RECORD\" = fi.\"RECORD\" " +
+            "    JOIN idx_biz_jg_supervision_info si ON si.\"RECORD\" = fi.\"RECORD\" " +
             "  WHERE" +
             "    oi.\"CLAIM_STATUS\" = '已认领' " +
             "    AND fi.\"PRODUCE_UNIT_CREDIT_CODE\" IS NOT NULL " +

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

@@ -229,6 +229,7 @@ public class SyncCylinderDataService {
                 item.setAppId((String) cylUseInfo.get("appId"));
                 item.setCreditCode((String) cylUseInfo.get("creditCode"));
                 item.setRegionCode((String) cylUseInfo.get("regionCode"));
+                item.setOrgBranchCode(Objects.toString(cylUseInfo.get("orgBranchCode"),""));
 
                 try {
                     item.setInspectionDateMs(parseDateOrDefault(item.getFillingStartTime()));

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/entity/ESCylinderFillingRecordDto.java

@@ -133,4 +133,7 @@ public class ESCylinderFillingRecordDto {
     //appid+气瓶唯一标识
     private String appIdAndSequenceCode;
 
+    //属地code
+    @Field(type = FieldType.Text)
+    private String orgBranchCode;
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/controller/CylinderInfoController.java

@@ -682,7 +682,7 @@ public class CylinderInfoController extends BaseController {
 		} else if ("company".equals(companyModel.getLevel())) {
 			esCylinderFillingRecordDto.setCreditCode(companyCode);
 		} else {
-			esCylinderFillingRecordDto.setRegionCode(companyCode);
+			esCylinderFillingRecordDto.setOrgBranchCode(companyModel.getOrgCode());
 		}
 
         Page<ESCylinderFillingRecordDto> pageResult = cylinderFillingRecordServiceImpl.queryByKeys(esCylinderFillingRecordDto, pageNum, pageSize);

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

@@ -320,6 +320,14 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             boolMust.must(query);
         }
 
+        //匹配属地Code
+        if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getOrgBranchCode())) {
+            flag = false;
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.wildcardQuery("orgBranchCode.keyword", "*" + esCylinderFillingRecordDto.getOrgBranchCode() + "*"));
+            boolMust.must(query);
+        }
+
         //匹配充装单位
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFillingUnitName())) {
             flag = false;
@@ -425,7 +433,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
 
         builder.query(boolMust);
         builder.sort("inspectionDateMs",SortOrder.DESC);
-        builder.sort("sequenceNbr",SortOrder.DESC);
+//        builder.sort("sequenceNbr",SortOrder.DESC);
         builder.from((pageNum - 1) * pageSize);
         builder.size(pageSize);
         builder.trackTotalHits(true);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -2217,7 +2217,7 @@ public class DataDockServiceImpl {
                 saveInspectInfo(equ, record);
                 saveTechParams(equ, record, equList);
                 saveEquInfoToEs(record, isCompleteXa);
-                this.saveInstallInfo(equ, record, equList);//安装信息
+                this.saveInstallInfo(equ);//安装信息
                 this.historyEquUpdateMaintenanceInfo(equ);//维保信息
                 if (!useRegistrationCode.isEmpty()){
                     this.handleHistoryEquip(equ);//历史登记
@@ -2321,28 +2321,6 @@ public class DataDockServiceImpl {
     }
 
     /**
-     * 历史设备登记-》更新安装信息
-     */
-    private void historyEquUpdateInstallInfo(Map<String, Object> map) {
-        IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
-        if (!ValidationUtil.isEmpty(constructionInfo.getSequenceNbr())) {
-            constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitName")) ? null : String.valueOf(map.get("uscUnitName")));
-            constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")));
-            constructionInfo.setConstructionLeaderPhone(ValidationUtil.isEmpty(map.get("installLeaderPhone")) ? null : String.valueOf(map.get("installLeaderPhone")));
-            constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));
-            constructionInfo.setConstructionContractAttachment(ValidationUtil.isEmpty(map.get("installContractAttachment")) ? null : JSONObject.toJSONString(map.get("installContractAttachment")));
-            constructionInfo.setConstructionOtherAccessories(ValidationUtil.isEmpty(map.get("insOtherAccessories")) ? null : JSONObject.toJSONString(map.get("insOtherAccessories")));
-            try {
-                constructionInfo.setUscDate(ValidationUtil.isEmpty(map.get("installStartDate")) ? null : DateUtils.dateParse((String) map.get("installStartDate"), DateUtils.DATE_PATTERN));
-            } catch (ParseException e) {
-                log.error(e.getMessage(), e);
-                throw new BadRequest("安装日期时间转化错误");
-            }
-            idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
-        }
-    }
-
-    /**
      * 按台套新增历史设备
      *
      * @param map
@@ -2614,7 +2592,6 @@ public class DataDockServiceImpl {
     public void updateHistory(Map<String, Object> map, String equipId, String currentDocumentId, String supervisoryCode) {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
-        // lambda.eq(JgRegistrationHistory::getEquId, equipId);
         lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
         lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
         lambda.eq(JgRegistrationHistory::getIsDelete, false);
@@ -2633,7 +2610,7 @@ public class DataDockServiceImpl {
         }
     }
 
-    private void saveInstallInfo(Map<String, Object> equ, String record, String equList) {
+    private void saveInstallInfo(Map<String, Object> equ) {
         IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equ), IdxBizJgConstructionInfo.class);
         constructionInfo.setUscUnitName(ValidationUtil.isEmpty(equ.get("installUnitName")) ? null : String.valueOf(equ.get("installUnitName")));
         constructionInfo.setUscUnitCreditCode(ValidationUtil.isEmpty(equ.get("installUnitCreditCode")) ? null : String.valueOf(equ.get("installUnitCreditCode")));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -445,7 +445,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("保存失败！");
+            throw new BadRequest("保存失败，请检查填写内容或联系管理员！");
         } finally {
             FlowingEquipRedisContext.clean();
         }