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/DataImportService.java

@@ -739,7 +739,6 @@ public class DataImportService extends BaseService {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
             FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-            evaluator.evaluateAll();
             if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
                 throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
             }
@@ -953,7 +952,6 @@ public class DataImportService extends BaseService {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
             FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-            evaluator.evaluateAll();
             if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
                 throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
             }
@@ -1063,7 +1061,6 @@ public class DataImportService extends BaseService {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
             FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-            evaluator.evaluateAll();
             if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
                 throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
             }
@@ -1171,7 +1168,6 @@ public class DataImportService extends BaseService {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
             FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-            evaluator.evaluateAll();
             if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
                 throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
             }
@@ -1292,7 +1288,6 @@ public class DataImportService extends BaseService {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
             FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-            evaluator.evaluateAll();
             if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
                 throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
             }
@@ -1574,7 +1569,6 @@ public class DataImportService extends BaseService {
             InputStream inputStream = file.getInputStream();
             Workbook workbook = WorkbookFactory.create(inputStream);
             FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
-            evaluator.evaluateAll();
             if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
                 throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
             }

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/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -381,7 +381,9 @@
             var year=now.getFullYear();
             var vatMonth=vatSessionService.month;
             if(vatSessionService.year==year){
-                if(vatMonth<month-1){
+                if(vatMonth===month-1){
+                    return false;
+                }else{
                     return true;
                 }
             }
@@ -390,35 +392,44 @@
             }
             return true;
         }
-        var startCaculate3 = function () {
-            var bool=checkYearMonthCaculate2();
-            if(bool){
-               swal({
-                   title: "warning!",
-                   text: $translate.instant('IsConfirmTimeNotSame'),
-                   type: "warning",
-                   showCancelButton: true,
-                   confirmButtonColor: "#dd6b55",
-                   confirmButtonText: $translate.instant('Yes'),
-                   cancelButtonText: $translate.instant('No'),
-                   closeOnConfirm: true,
-                   closeOnCancel: true
-               },
-               function (isConfirm) {
-                   if(isConfirm){
-                    startCaculate2();
-                   }else{
-                       return ;
-                   }
-               })
+
+        var confirmWithContinue=function (title, text, customClass) {
+            var deferred = $q.defer();
+            SweetAlert.swal({
+                    title: title,
+                    text: text,
+                    html: true,
+                    type: "warning",
+                    customClass: customClass || '',
+                    showCancelButton: true,
+                    confirmButtonColor: "#dd6b55",
+                    allowOutsideClick: false,
+                    confirmButtonText: $translate.instant('Yes'),
+                    cancelButtonText: $translate.instant('No'),
+                    closeOnConfirm: true,
+                    closeOnCancel: true
+                },
+                function (isConfirm) {
+                    deferred.resolve(isConfirm);
+                });
+
+            return deferred.promise;
+        }
+
+        var startCaculate4=function(){
+            if(checkYearMonthCaculate2()){
+                confirmWithContinue($translate.instant('IsConfirmTimeNotSame')).then(function (isConfirm) {
+                    if(isConfirm){
+                        startCaculate2();
+                    }
+                })
             }else{
                 startCaculate2();
             }
         }
 
-
-
          var startCaculate2 = function () {
+            
                     if (vatSessionService.project.projectStatusList[vatSessionService.month] >= constant.ProjectStatusEnum.Generated) {
                         swal({
                                 title: "warning!",
@@ -727,7 +738,7 @@
             $scope.resolveRef = [];
             initTasks();
             $scope.startCaculate = startCaculate;
-            $scope.startCaculate3 = startCaculate3;
+            $scope.startCaculate4 = startCaculate4;
             $scope.$on('$destroy',function(){
                 if($scope.timer)$interval.cancel($scope.timer);
             });

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.html

@@ -3,7 +3,7 @@
     <div class="vat-caculate-data-title" ng-if="tasks.length > 0">
         <!--<span translate="vatCaculateDataDesc"></span>-->
         <!--<button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate()"></button>-->
-        <button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate3()"></button>
+        <button class="btn btn-vat-primary" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate4()"></button>
         <span ng-click="showOperateLogPop()"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'Remarks' | translate}}</span>
     </div>