1、fixbug

atms-api/src/main/java/pwc/taxtech/atms/controller/EbsApiController.java

@@ -142,13 +142,13 @@ public class EbsApiController {
         return ApiResultDto.fail();
     }
     @RequestMapping(value = "/updateOrg", method = RequestMethod.POST)
-    public ApiResultDto updateOrg(@RequestBody @Valid List<OrganizationQueryDto> items) {
+    public ApiResultDto updateOrg(@RequestParam("id") Long id,@RequestBody @Valid List<OrganizationQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateOrg return items is empty");
             return ApiResultDto.success(Collections.emptyList());
         }
         try {
-            ebsApiService.queryRemoteServerThenUpdateOrg(items);
+            ebsApiService.queryRemoteServerThenUpdateOrg(id,items);
             return ApiResultDto.success();
         } catch (Exception e) {
             logger.error("updateOrg error.", e);

atms-api/src/main/java/pwc/taxtech/atms/service/EbsApiService.java

@@ -67,5 +67,5 @@ public interface EbsApiService {
      *
      * @param items
      */
-    void queryRemoteServerThenUpdateOrg(List<OrganizationQueryDto> items);
+    void queryRemoteServerThenUpdateOrg(Long id, List<OrganizationQueryDto> items);
 }

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

@@ -48,6 +48,8 @@ public class EbsApiServiceImpl implements EbsApiService {
     private OrganizationEmployeeMapper organizationEmployeeMapper;
     @Resource
     private OrganizationExtraMapper organizationExtraMapper;
+    @Resource
+    private DataImportLogMapper dataImportLogMapper;
 
     @Resource
     private DistributedIdService distributedIdService;
@@ -698,7 +700,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         result.setUpdateTime(new Date());
     }
     @Override
-    public void queryRemoteServerThenUpdateOrg(List<OrganizationQueryDto> items) {
+    public void queryRemoteServerThenUpdateOrg(Long id , List<OrganizationQueryDto> items) {
         long start = System.currentTimeMillis();
         logger.debug("start queryRemoteServerThenUpdateOrg 机构表");
         //判断数据是否存在
@@ -714,6 +716,7 @@ public class EbsApiServiceImpl implements EbsApiService {
                 logger.error("break loop as catch:" + e, e);
             }
         }
+        updateDataImportLog(id,items.size());
         logger.debug("end queryRemoteServerThenUpdateOrg 机构表,took [{}] ms", System.currentTimeMillis() - start);
     }
 
@@ -766,6 +769,18 @@ public class EbsApiServiceImpl implements EbsApiService {
         oe.setEmployeesNumEnd(a.getStaffSize());
         organizationEmployeeMapper.insertSelective(oe);
     }
+
+
+
+    private void updateDataImportLog(Long id, int size) {
+        DataImportLog dataImportLog = new DataImportLog();
+        dataImportLog.setId(id);
+        dataImportLog.setRecordSize(size);
+        dataImportLog.setImportResult(true);
+        dataImportLogMapper.updateByPrimaryKeySelective(dataImportLog);
+    }
+
+
     /**
      * 获取格式化时间
      * 返回时间类型 yyyy-MM-dd HH:mm:ss