feat(jg): 优化登记机关代号获取逻辑

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

@@ -57,10 +57,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.service.RemindServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
-import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
-import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
-import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
-import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
+import com.yeejoin.amos.boot.module.jg.biz.utils.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.*;
@@ -319,6 +316,9 @@ public class CommonServiceImpl implements ICommonService {
     @Autowired
     private RestHighLevelClient restHighLevelClient;
 
+    @Autowired
+    CodeUtil codeUtil;
+
     public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE";
 
     public static byte[] file2byte(File file) {
@@ -2097,6 +2097,8 @@ public class CommonServiceImpl implements ICommonService {
                 // 登记机关代号,特殊区域用特殊区域如韩城-Y、杨凌-V、西咸-U
                 String city = "";
                 if (!ValidationUtil.isEmpty(supervisoryCompanyCode)) {
+                    // 根据接收机构动态获取接收机构对应行政区划code
+                    supervisoryCompanyCode = codeUtil.getCityRegionCode(supervisoryCompanyCode);
                     DataDictionary specialRegionCode = dataDictionaryService.getByCode(supervisoryCompanyCode, SPECIAL_REGION_CODE);
                     if (!ValidationUtil.isEmpty(specialRegionCode)) {  // 特殊的区域
                         city = specialRegionCode.getName();