1、fix bug

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

@@ -1927,7 +1927,7 @@ public class DataImportService extends BaseService {
                     case EbsExtractTypeConstant.OCTB:
                         break;
                     case EbsExtractTypeConstant.RATE:
-                        response = HttpUtil.post(ebsCallUrl + "/fsgCash"+"?dailyRates=" + period,
+                        response = HttpUtil.post(ebsCallUrl + "/dailyRates"+"?period=" + period,
                                 "","application/json;charset=utf-8", "UTF-8", 10000, 10000);
                         break;
                     default:

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

@@ -406,13 +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/ddOrgJson.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();
+//        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());
@@ -438,6 +440,29 @@ 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");
+            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);
+
+
+
+    }
+
     private void setProperty(Object obj, String propertyName, Object value) {
         try{
             Class c = obj.getClass();

atms-web/src/main/webapp/app/common/controls/edit-user-modal/edit-user-modal.html

@@ -34,7 +34,7 @@
                         <div class="form-group">
                             <label class="control-label col-sm-3"><span class="red-color">*</span><span translate="Company"></label>
                             <div class="col-sm-9">
-                                <input id="orgName" type="text" name="orgName" maxlength="100" class="form-control" style="width: 300px;"  ng-model="editUserModel.OrgName" readonly="readonly" required>
+                                <input id="orgName" type="text" name="orgName" maxlength="100" class="form-control" style="width: 300px;"  ng-model="editUserModel.orgName" readonly="readonly" required>
                                 <!--<org-selector selected-org-name="editUserModel.OrgName" selected-org-id="editUserModel.OrganizationID" component-selected-org="" is-show-all="false" is-require="true"
                                               style="width: 300px;"></org-selector>
                                 <label class="error-label" style="font-size:12px;" ng-show="editUserModel.organizationIDError">{{editUserModel.organizationIDError}}</label>-->