汇率抽取

atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java

@@ -1866,6 +1866,7 @@ public class DataImportService extends BaseService {
         List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
         // 这里会导致任何人都可以看到未映射到主体的数据
         orgIds.add("");
+        orgIds.add(Constant.ALL);
         if (!EnumImportType.Undefined.getCode().equals(param.getType())) {
             criteria.andTypeEqualTo(param.getType()).andDisplayEqualTo(true);
             criteria.andOrganizationIdIn(orgIds);
@@ -2120,13 +2121,13 @@ public class DataImportService extends BaseService {
             int year = periodInt / 100;
             int month = periodInt % 100;
             DataImportLog log = new DataImportLog();
-            log.setTaxpayerIdNum(org.getTaxPayerNumber());
-
             if (type == EbsExtractTypeConstant.RATE) {
+                log.setTaxpayerIdNum(Constant.ALL);
                 log.setCompanyName(Constant.ALL);
                 log.setOrganizationId(Constant.ALL);
                 log.setCompanyCode(Constant.ALL);
             } else {
+                log.setTaxpayerIdNum(org.getTaxPayerNumber());
                 log.setCompanyName(org.getName());
                 log.setOrganizationId(org.getId());
                 log.setCompanyCode(code);
@@ -2140,7 +2141,9 @@ public class DataImportService extends BaseService {
             log.setOperator(operator);
             log.setId(idService.nextId());
             try {
-                if (StringUtils.isEmpty(org.getEnterpriseAccountCode())) {
+                if (type == EbsExtractTypeConstant.RATE) {
+                    //do nothing
+                }else if (StringUtils.isEmpty(org.getEnterpriseAccountCode())) {
                     log.setImportResult(false);
                     log.setErrorMsg(String.format(EnumApiCodeMsg.CALLFAILED.getMsg(), ErrorMessageCN.NoLedgerID));
                 } else if (StringUtils.isEmpty(org.getCode())) {