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/controller/ReportController.java

@@ -336,8 +336,6 @@ public class ReportController {
         }
         return  operationResultDto.success();
     }
-
-
     /**
      * 批量导出利润表
      */

atms-web/src/main/webapp/app/analysis/table/sheet/table-report-sheet.js

@@ -111,7 +111,7 @@
                 };
 
                 //初始化spread
-                vat _init = function(){
+                var _init = function(){
                     return templateService.getPeriodTemplateJsonByOrg(templateId, scope.relation.period, scope.relation.orgId).then(function (reportSpread) {
                         if (!_.isEmpty(reportSpread)) {
                             initSpreadExcel(reportSpread, true).then(function (spread) {

atms-web/src/main/webapp/app/analysis/table/tb-ebit-form.ctrl.js

@@ -2921,7 +2921,7 @@
             vatReportService.saveAndRefresh($scope.relation.orgId, $scope.relation.period, specialConsiderations, ebitRate).success(function(res){
                 if(res.result){
                     $scope.relation.data = res.data;
-                    $timeout(function(){//
+                    $timeout(function(){
                         spreadTODb();
                     }, 7000);
                 }