[DEV] add approval exception deal

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

@@ -452,12 +452,6 @@ public class ReportServiceImpl {
     public OperationResultDto generateData(String projectId, EnumServiceType serviceType, Boolean isMergeManualData,
                                            Integer periodParam, Integer reportType, Optional<String> generator) {
         OperationResultDto operationResultDto = new OperationResultDto();
-        try {
-            if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null || periodParam <= 0)) {
-                operationResultDto.setResultMsg("PeriodRequiredForVAT");
-                return operationResultDto;
-            }
-
             MyAsserts.assertEq(serviceType, EnumServiceType.VAT, new NotFoundException());
             PeriodJobExample example = new PeriodJobExample();
             example.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(periodParam)
@@ -466,6 +460,11 @@ public class ReportServiceImpl {
             String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, periodParam);
             MyAsserts.assertTrue(status == null || status.equals(Constant.APPROVAL_DISAGREED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);
 
+        try {
+            if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null || periodParam <= 0)) {
+                operationResultDto.setResultMsg("PeriodRequiredForVAT");
+                return operationResultDto;
+            }
 
             List<Template> templates = getTemplatesByProjectId(projectId);
 

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -2539,7 +2539,7 @@
         };
 
          $scope.commitApprove = function(){
-              vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.project.month).success(function(result){
+              vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.month).success(function(result){
                   if(result&&result=='committed'){
                       SweetAlert.swal({
                           title: "warning!",

atms-web/src/main/webapp/app/common/vatservices/vatApproveService.js

@@ -26,7 +26,7 @@
         },
 
         approvalStatus:function(projectId,period){
-            return $http.get('/approval/'+projectId+'/'+period,apiConfig.createVat({ignoreLoadingBar: true}))
+            return $http.get('/approval/status/'+projectId+'/'+period,apiConfig.createVat({ignoreLoadingBar: true}))
         }
     };
 }]);
\ No newline at end of file

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

@@ -293,7 +293,7 @@
 
                    },1000);
                   }
-               }).error(function () {
+               }).error(function (data) {
                    $log.debug("generate all report may be some error");
 //                   taskError(_this);
                });