抽取分发bug

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

@@ -1881,11 +1881,12 @@ public class DataImportService extends BaseService {
         String effectiveDateTo = param.getEffectiveDateTo();
         List<Future> resList = Lists.newArrayList();
         List<Integer> dataTypes = param.getDataTypes();
+        String operator = authUserHelper.getCurrentAuditor().get();
         dataTypes.forEach(type -> {
             orgs.forEach(o -> {
                 try {
                     Callable callEbs = new CallEbsThread(type, o,ebsCallUrl,dataImportLogMapper,authUserHelper,
-                            idService,dtsTokenService,period, effectiveDateFrom, effectiveDateTo);
+                            idService,dtsTokenService,period, effectiveDateFrom, effectiveDateTo, operator);
                     executorService.submit(callEbs);
 //                    resList.add(future);
                 } catch (RejectedExecutionException rje) {
@@ -2004,10 +2005,11 @@ public class DataImportService extends BaseService {
         private String effectiveDateFrom;
 
         private String effectiveDateTo;
+        private String operator;
 
         CallEbsThread(int type, Organization org, String ebsCallUrl, DataImportLogMapper dataImportLogMapper,
                       AuthUserHelper authUserHelper, DistributedIdService idService, DtsTokenService dtsTokenService,
-                      String period,String effectiveDateFrom, String effectiveDateTo) {
+                      String period,String effectiveDateFrom, String effectiveDateTo, String operator) {
             this.type = type;
             this.org = org;
             this.period = period;
@@ -2018,6 +2020,7 @@ public class DataImportService extends BaseService {
             this.dataImportLogMapper = dataImportLogMapper;
             this.effectiveDateFrom = effectiveDateFrom;
             this.effectiveDateTo = effectiveDateTo;
+            this.operator = operator;
         }
 
         @Override
@@ -2038,7 +2041,7 @@ public class DataImportService extends BaseService {
             log.setType(EnumImportType.ExtractFinancialData.getCode());
             log.setFileType(EnumEbsExtractType.getNameByCode(type));
             log.setPeriodStatus("EBS抽取");
-            log.setOperator(authUserHelper.getCurrentAuditor().get());
+            log.setOperator(operator);
             try {
                 if (StringUtils.isEmpty(org.getEnterpriseAccountCode())) {
                     log.setId(idService.nextId());

atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.ctrl.js

@@ -188,7 +188,17 @@
                     allowHeaderFiltering: false,
                     width: '20%',
                     caption: $translate.instant('Status')
-                }
+                }, {
+                        dataField: "operator",
+                        allowHeaderFiltering: false,
+                        width: '10%',
+                        caption: $translate.instant('LogOperationUser')
+                    }, {
+                        dataField: "operateTime",
+                        allowHeaderFiltering: false,
+                        width: '10%',
+                        caption: $translate.instant('LogOperationTime')
+                    }
                 ],
                 onContentReady: function (e) {
                     $scope.extractFinancialInstance = e.component;