Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/TzsAppService.java

@@ -275,7 +275,7 @@ public class TzsAppService {
         }
         map.putAll(getQRCode(record));
 
-        if(map.get("EQU_LIST_CODE").equals("3000")) {
+        if("3000".equals(map.get("EQU_LIST_CODE"))) {
             JSONArray jsonArray = new JSONArray();
             // 基本信息
             JSONObject exFactoryJsonObject = new JSONObject();

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/CylinderAreaDataServiceImpl.java

 package com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CityCylinderInfoDto;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
@@ -9,26 +8,19 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderAreaData;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderAreaDataMapper;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ICylinderAreaDataService;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderAreaDataDto;
-import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.core.CountResponse;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

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/JgUseRegistrationServiceImpl.java

@@ -1854,13 +1854,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (!ObjectUtils.isEmpty(result)) {
                 otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
                 otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
-                otherInfo.setClaimStatus("已认领");
-                otherInfoMapper.updateById(otherInfo);
-
                 // 更新使用登记业务表
                 jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
             }
         }
+        otherInfo.setClaimStatus("已认领");
+        otherInfoMapper.updateById(otherInfo);
     }
 
     /**