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

atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrganizationServiceTemplateGroupDto.java

 package pwc.taxtech.atms.dpo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class OrganizationServiceTemplateGroupDto {
@@ -11,8 +12,11 @@ public class OrganizationServiceTemplateGroupDto {
     @JsonProperty("serviceTypeID")
     private String serviceTypeId;
     private String serviceTypeName;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     @JsonProperty("templateGroupID")
     private Long templateGroupId;
+
     private String templateGroupName;
 
     /**

atms-web/src/main/webapp/app/common/controls/import/import-trialbalance/import-trialbalance.html

@@ -25,7 +25,7 @@
                         {{'SelectFile' | translate}}
                     </button>
                     <div ng-show="fileName" style="display:inline-block">
-                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|
+                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:50}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|
                         <span translate="WorkSheet"></span>
                         <div class="ui-select-no-border">
                             <ui-select ng-model="sheetInfo.selectedSheetName" on-select="changeSheet($item)" search-enabled="false" style="width:120px;">

atms-web/src/main/webapp/app/vat/import/vat-import-income-invoice/vat-import-income-invoice.html

@@ -23,7 +23,7 @@
                         {{'SelectFile' | translate}}
                     </button>
                     <div class="import-info-wrapper" ng-show="fileName">
-                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|
+                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:50}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|
                         <span translate="WorkSheet"></span>
                         <div class="ui-select-no-border">
                             <ui-select ng-model="sheetInfo.selectedSheetName" on-select="changeIncomeInvoiceSheet($item)" search-enabled="false" style="width:120px;">

atms-web/src/main/webapp/app/vat/import/vat-import-output-invoice/vat-import-output-invoice.html

@@ -30,7 +30,7 @@
                         {{'SelectFile' | translate}}
                     </button>
                     <div class="import-info-wrapper" ng-show="fileName">
-                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|
+                        <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:50}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|
                         <span translate="WorkSheet"></span>
                         <div class="ui-select-no-border">
                             <ui-select ng-model="sheetInfo.selectedSheetName" on-select="changeSheet($item)" search-enabled="false" style="width:120px;">