Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -21,7 +21,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
 
     Map<String, Object> getUserInfo(String sequenceNbr);
 
-    Map<String,Object> getEnterpriseInfo(String sequenceNbr);
+    Map<String,Object> getEnterpriseInfo(String useCode);
 
     List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
 

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

@@ -36,16 +36,16 @@
           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
-        FROM
-            tz_base_enterprise_info
-        WHERE
-            sequence_nbr =#{sequenceNbr} AND is_delete = '0';
+        SELECT sequence_nbr       sequenceNbr,
+               supervise_org_code superviseOrgCode,
+               supervise_org_name superviseOrgName,
+               use_code           useCode,
+               use_unit           useUnit,
+               address
+        FROM tz_base_enterprise_info
+        WHERE use_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/controller/CommonController.java

@@ -9,8 +9,10 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IPdfService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,8 +156,8 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getEnterpriseInfo")
     @ApiOperation(httpMethod = "GET", value = "查询企业的基本信息", notes = "查询企业的基本信息")
-    public ResponseModel<Map<String, Object>> getEnterpriseInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
-        return ResponseHelper.buildResponse(commonService.getEnterpriseInfo(sequenceNbr));
+    public ResponseModel<Map<String, Object>> getEnterpriseInfo(@RequestParam(value = "useCode") String useCode) {
+        return ResponseHelper.buildResponse(commonService.getEnterpriseInfo(useCode));
     }
 
     /**
@@ -408,6 +410,21 @@ public class CommonController extends BaseController {
         return useFlagParamDto;
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/vehicleInformationDict")
+    @ApiOperation(httpMethod = "GET", value = "按照类型查询车载气瓶相关的字典值", notes = "按照类型查询车载气瓶相关的字典值")
+    public ResponseModel<List<DictionarieValueModel>> vehicleInformationDict(@RequestParam(value = "type") String ype) {
+        return ResponseHelper.buildResponse(Systemctl.dictionarieClient.dictValues(ype).getResult());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getRegionCity")
+    @ApiOperation(httpMethod = "GET", value = "车用气瓶中获取陕西市级城市", notes = "车用气瓶中获取陕西市级城市")
+    public ResponseModel<Object> getRegionCity() {
+        FeignClientResult<List<RegionModel>> listFeignClientResult = Systemctl.regionClient.queryByLevel("2");
+        return ResponseHelper.buildResponse(listFeignClientResult.getResult());
+    }
+
 
 
 }

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

@@ -38,7 +38,7 @@ public interface ICommonService {
 
     Map<String, Object> getUserInfo(String sequenceNbr);
 
-    Map<String, Object> getEnterpriseInfo(String sequenceNbr);
+    Map<String, Object> getEnterpriseInfo(String useCode);
 
     List<Map<String, Object>> getEnterpriseEmployee(String unitCode);
 

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
@@ -70,7 +69,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -642,8 +640,8 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public Map<String, Object> getEnterpriseInfo(String sequenceNbr) {
-        return commonMapper.getEnterpriseInfo(sequenceNbr);
+    public Map<String, Object> getEnterpriseInfo(String useCode) {
+        return commonMapper.getEnterpriseInfo(useCode);
     }
 
     @Override