[DEV] fixed error msg and add trancaction

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

@@ -92,11 +92,13 @@ public class ReportGeneratorImpl {
         for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
             Sheet sheet = workbook.getSheetAt(i);
             String code = sheet.getSheetName();
+            logger.info("-------------------------------------Begin Job [{}]------------------------------------------------------",code);
             job.setCurrentStep(code);
-            Optional<PeriodTemplate> periodTemplate = resources.getPeriodTemplates().stream()
-                    .filter(a -> a.getCode().equals(code))
-                    .findFirst();
+
             try {
+                Optional<PeriodTemplate> periodTemplate = resources.getPeriodTemplates().stream()
+                        .filter(a -> a.getCode().equals(code))
+                        .findFirst();
 
                 Long templateId;
                 if (periodTemplate.isPresent()) {
@@ -387,10 +389,12 @@ public class ReportGeneratorImpl {
             } catch (Exception e) {
                 e.printStackTrace();
                 job.setStatus(WrapPeriodJobDto.STATUS_ERROR);
-                job.setErrorMsg("cacals report for code " + code + " failed");
+                job.setErrorMsg("cacals report for code " + code + " failed with msg "+e.getMessage());
             } finally {
                 periodJobMapper.updateByPrimaryKey(job);
             }
+
+            logger.info("-------------------------------------End Job [{}]------------------------------------------------------",code);
         }
     }
 

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

@@ -495,7 +495,7 @@ public class ReportServiceImpl {
 
                     } catch (Exception e) {
                         genJob.setStatus(WrapPeriodJobDto.STATUS_ERROR);
-                        genJob.setErrorMsg("Sever error");
+                        genJob.setErrorMsg("Sever error "+e.getMessage());
                         periodJobMapper.updateByPrimaryKey(genJob);
                         e.printStackTrace();
                     }

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

@@ -2540,7 +2540,7 @@
          $scope.commitApprove = function(){
               vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.month).success(function(result){
                   if(result&&result=='committed'){
-                      SweetAlert.error($translate.instant('报表提审中或审核通过'));
+                     SweetAlert.error('报表提审中或审核已通过！');
                   }else{
                         SweetAlert.swal({
                             title: "warning!",

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

@@ -90,7 +90,7 @@
                     return $q.when(data);
                 },function (data) {
                    if(data.status==412){
-                      SweetAlert.error($translate.instant('报表提审中或审核通过'));
+                      SweetAlert.error('报表提审中或审核已通过！');
                    }else{
                       logInfo.UpdateState = $translate.instant('ManualInputFail');
                       SweetAlert.error($translate.instant('PleaseContactAdministrator'));

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

@@ -295,7 +295,7 @@
                   }
                }).error(function (data,status,config,statusText) {
                   if(status==412){
-                     SweetAlert.error('报表提审中或审核通过');
+                     SweetAlert.error('报表提审中或审核已通过！');
                   }
                });