1、fix bug

atms-api/src/test/java/pwc/taxtech/atms/service/impl/DataInitTest.java

@@ -406,15 +406,15 @@ public class DataInitTest extends CommonIT {
          */
         String input = "";
         try {
-//            File targetFile = new File("src/main/resources/orgImport/ddOrgJson.json");
-            File targetFile = new File("src/main/resources/orgImport/failedJson.json");
+            File targetFile = new File("src/main/resources/orgImport/ddOrgJson2.json");
+//            File targetFile = new File("src/main/resources/orgImport/failedJson.json");
             input = FileUtils.readFileToString(targetFile, "UTF-8");
         } catch (Exception e) {
             e.printStackTrace();
         }
-//        DDSyncOrgInfo ddSyncOrgInfo = JSONObject.parseObject(input,DDSyncOrgInfo.class);
-//        List<OrgSyncData> orgSyncDatas = ddSyncOrgInfo.getData();
-        List<OrgSyncData> orgSyncDatas = JSONArray.parseArray(input,OrgSyncData.class);
+        DDSyncOrgInfo ddSyncOrgInfo = JSONObject.parseObject(input,DDSyncOrgInfo.class);
+        List<OrgSyncData> orgSyncDatas = ddSyncOrgInfo.getData();
+//        List<OrgSyncData> orgSyncDatas = JSONArray.parseArray(input,OrgSyncData.class);
         orgSyncDatas.forEach(osd -> {
             OrganizationExample example = new OrganizationExample();
             example.createCriteria().andNameEqualTo(osd.getNameCN());
@@ -442,11 +442,6 @@ public class DataInitTest extends CommonIT {
 
     @Test
     public void testOrg(){
-        /**
-         * 1、taxPayNums http 滴滴oa接口同步机构的信息
-         * 2、逐条update,记录更新失败或未更新上的taxPayNum
-         * 3、失败的再次处理
-         */
         String input = "";
         try {
 //            File targetFile = new File("src/main/resources/orgImport/ddOrgJson.json");

atms-web/src/main/java/pwc/taxtech/atms/web/controller/AccountController.java

@@ -208,7 +208,7 @@ public class AccountController {
             response.addCookie(ddTicketCookie);
             response.addCookie(ddJumptoCookie);
             // todo 这里写死为DD的登出地址了
-            response.sendRedirect(" http://mis.diditaxi.com.cn/auth/ldap/logout?app_id=2500");
+            response.sendRedirect("http://mis.diditaxi.com.cn/auth/ldap/logout?app_id=2500");
         } catch (Exception e) {
             logger.error("登出失败", e);
         }

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

@@ -109,7 +109,7 @@
             var periodStr = $scope.UploadPeriodTime;
             dataImportService.callExtractFinancialData($scope.checkedCompanyCodeList,periodStr,$scope.checkedFileCodeList).success(function (data) {
                 if (data) {
-
+                    getFinancialDataStatus();
                 }
             });
         };
@@ -123,11 +123,11 @@
             }
         };
 
-        var loadImportATStatusInfoDatagrid = function () {
+        var loadExtractFinancialInfoDatagrid = function () {
 
-            $scope.importATStatusGridOptions = {
+            $scope.extractFinancialGridOptions = {
                 bindingOptions: {
-                    dataSource: 'ImportATStatusGridSource'
+                    dataSource: 'extractFinancialGridSource'
                 },
                 showBorders: true,
                 columns: [{
@@ -221,11 +221,11 @@
         };
 
         var getFinancialDataStatus = function () {
-            vatImportService.displayImportLog(constant.importFileType.ExtractFinancialData).success(function (data) {
+            vatImportService.displayImportLog($scope.pagingOptions,constant.importFileType.ExtractFinancialData).success(function (data) {
                 if (data) {
-                    $scope.ImportATStatusGridSource = data;
-                    for (var i = 1; i <= $scope.ImportATStatusGridSource.length; i++) {
-                        $scope.ImportATStatusGridSource[i - 1].index = i;
+                    $scope.extractFinancialGridSource = data;
+                    for (var i = 1; i <= $scope.extractFinancialGridSource.length; i++) {
+                        $scope.extractFinancialGridSource[i - 1].index = i;
                     }
                 }
             });
@@ -416,7 +416,7 @@
             checkUserOrganizationPermissionList();
             getUserPermission();
             initCompanyList();
-            loadImportATStatusInfoDatagrid();
+            loadExtractFinancialInfoDatagrid();
             initDatePicker();
 
             $timeout(function () {

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

@@ -74,7 +74,7 @@
       
         <div class="dt-init-wrapper">
             <div class="dx-viewport grid-container">
-                <div id="importATStatusGridContainer" dx-data-grid="importATStatusGridOptions"
+                <div id="extractFinancialGridContainer" dx-data-grid="extractFinancialGridOptions"
                      style="margin-top: 30px;">
                 </div>
             </div>

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

@@ -247,7 +247,7 @@
                 }
             }
 
-            .importATStatusGridContainer {
+            .extractFinancialGridContainer {
                 height: calc(~'100% - 30px');
                 overflow: hidden;
                 position: absolute;