fix(jg):车用气瓶使用地址，使用单位为个人时查询地址问题

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -42,16 +42,15 @@
           AND is_delete = 0
     </select>
     <select id="getEnterpriseInfo" resultType="java.util.Map">
-        SELECT sequence_nbr       sequenceNbr,
-               supervise_org_code superviseOrgCode,
-               supervise_org_name superviseOrgName,
-               use_code           useCode,
-               use_unit           useUnit,
-               address
+        SELECT sequence_nbr                   as sequenceNbr,
+               supervise_org_code             as superviseOrgCode,
+               supervise_org_name             as superviseOrgName,
+               use_code                       as useCode,
+               use_unit                       as useUnit,
+               address                        as address
         FROM tz_base_enterprise_info
-        WHERE use_code = #{useCode}
-          AND is_delete = '0'
-        limit 1;
+        WHERE use_unit_code = #{useCode}
+          AND is_delete = '0' limit 1
     </select>
     <select id="getEnterpriseEmployee" resultType="java.util.Map">
         SELECT

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

@@ -648,13 +648,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 // 更新设备信息
                 this.updateEquipMessage(jgVehicleInformation, mapData, registerInfo, otherInfo);
 
-                // 使用信息
-                LambdaQueryWrapper<IdxBizJgUseInfo> lambdaUseInfo = new QueryWrapper<IdxBizJgUseInfo>().lambda();
-                lambdaUseInfo.eq(IdxBizJgUseInfo::getRecord, String.valueOf(mapData.get("record")));
-                IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambdaUseInfo);
-                String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName();
                 // 更新es
-                updateEsData(usePlace, mapData, jgVehicleInformation, otherInfo);
+                updateEsData(mapData, jgVehicleInformation, otherInfo);
             }
 
             // 更新代办状态
@@ -673,7 +668,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         this.getBaseMapper().updateById(jgVehicleInformation);
     }
 
-    public void updateEsData(String usePlace, JSONObject dataMap, JgVehicleInformation jgVehicleInformation, IdxBizJgOtherInfo otherInfo) {
+    public void updateEsData(JSONObject dataMap, JgVehicleInformation jgVehicleInformation, IdxBizJgOtherInfo otherInfo) {
         // 更新es
         HashMap<String, Map<String, Object>> objMap = new HashMap<>();
         HashMap<String, Object> param = new HashMap<>();
@@ -681,7 +676,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
         param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
         param.put("ADDRESS", dataMap.getOrDefault("address", ""));
-        param.put("USE_PLACE", usePlace);
+        param.put("USE_PLACE", jgVehicleInformation.getUseUnitAddress());
         param.put("STATUS", "已认领");
         param.put("EQU_STATE", 1);
         param.put("ORG_BRANCH_CODE", jgVehicleInformation.getOrgBranchCode());