Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

@@ -812,7 +812,7 @@ public class EbsApiServiceImpl implements EbsApiService {
     public void changeCallBackStatus(EbsCallBackDto ebsCallBackDto) {
         DataImportLog dataImportLog = new DataImportLog();
         dataImportLog.setId(ebsCallBackDto.getTaskId());
-        dataImportLog.setImportResult(ebsCallBackDto.getTaskStatus().equals("S")?true:false);
+        dataImportLog.setImportResult("S".equals(ebsCallBackDto.getTaskStatus())?true:false);
         dataImportLog.setErrorMsg(ebsCallBackDto.getTaskDesc());
         dataImportLog.setUpdateTime(new Date());
         int res = dataImportLogMapper.updateByPrimaryKeySelective(dataImportLog);

atms-api/src/main/resources/conf/conf_profile_pub.properties

-jdbc_url=jdbc:mysql://10.88.128.65:8806/fintax_stage?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-jdbc_user=fintax_user_stage
-jdbc_password=Fintaxuser@123Stage
+jdbc_url=jdbc:mysql://172.20.2.218:3300/fintax_test?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+jdbc_user=fintax_user_test
+jdbc_password=Fintaxuser@123Test
 #jdbc_password=111111
 jdbc_admin_db=taxadmin2018
 
@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
 mail_jdbc_user=sa
 mail_jdbc_password=atmsunittestSQL
 
-web.url=http://dts.erp.didichuxing.com
+web.url=http://dts.erp.didichuxing.com:9001
 #web.url=*
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
@@ -33,7 +33,7 @@ max_file_length=104857600
 distributed_id_datacenter=10
 distributed_id_machine=15
 
-api.url=http://dts.erp.didichuxing.com
+api.url=http://dts.erp.didichuxing.com:8180
 
 # Longi config
 longi_api_basic_user=
@@ -59,7 +59,7 @@ org_sync_token=174af08f
 dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
 
 
-ebs_call_url=http://172.20.2.220:8080/ebs-proxy-test/dts
+ebs_call_url=http://172.20.3.109:8010/ebs-proxy-test/dts
 
 #tableau config
 tableau_get_ticket=http://172.20.2.220:8080/trusted?username=%s
@@ -75,5 +75,3 @@ tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexi
 tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
 tableau_dashboard=http://10.158.230.16:8890/trusted/%s/views/Didi_Tax_20190307/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
-
-

atms-web/src/main/resources/conf_profile_pub.properties

-api.url=http://dts.erp.didichuxing.com
+api.url=http://dts.erp.didichuxing.com:8180/
 
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html

@@ -744,7 +744,7 @@
                                 <span class="required-tip"> * </span>
                                 {{'Company Name' | translate}}
                             </label>
-                            <div class="col-sm-11" style="width:61.67%" id="companyNameOptionsMap">
+                            <div class="col-sm-11" style="width:61.67%;height: 13px" id="companyNameOptionsMap">
                                 <div dx-select-box="editOrgOptions"></div>
                                 <!--<select ng-model="editFieldModel.companyName" class="form-control"-->
                                         <!--title="{{editFieldModel.companyName}}" required-->
@@ -987,7 +987,7 @@
                                             <span class="required-tip"> * </span>
                                             {{'Company Name' | translate}}
                                         </label>
-                                        <div class="col-sm-11" style="width:61.67%">
+                                        <div class="col-sm-11" style="width:61.67%;height: 13px">
                                             <div ng-class="{'upload-fail-mark':!editFieldItem.companyName}" dx-select-box="editFieldItemOrgOptions"></div>
                                             <!--<select ng-model="editFieldItem.companyName" class="form-control"-->
                                                     <!--title="{{editFieldItem.companyName}}"-->