[DEV] set status error postion

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

@@ -94,6 +94,7 @@ public class ReportGeneratorImpl {
             Sheet sheet = workbook.getSheetAt(i);
             String code = sheet.getSheetName();
             logger.info("-------------------------------------Begin Job [{}]------------------------------------------------------", code);
+            setStatus(job, STATUS_END);
             setStatus(job,code,STATUS_BEGIN);
             job.setCurrentStep(code);
             periodJobMapper.updateByPrimaryKey(job);
@@ -406,8 +407,6 @@ public class ReportGeneratorImpl {
                     }
                 }
             }
-            setStatus(job,code,STATUS_END);
-            periodJobMapper.updateByPrimaryKey(job);
             logger.info("-------------------------------------End Job [{}]------------------------------------------------------", code);
         }
     }

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

@@ -277,9 +277,6 @@ public class ReportServiceImpl {
         List<Long> exceptTemplateIds = templateMapper.getIdsForExceptTemplate();
         clearPeriodData(projectId, period, exceptTemplateIds, isMergeManualData);
         copyTemplateAndConfigFromAdmin(projectId, templates, period);
-
-        setStatus(job, STATUS_END);
-        periodJobMapper.updateByPrimaryKey(job);
     }
 
     private List<Template> getTemplatesByProjectId(String projectId) {
@@ -517,12 +514,13 @@ public class ReportServiceImpl {
                         evaluator.evaluateAll();
 
                         reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
+                        setStatus(genJob,STATUS_END);
+                        periodJobMapper.updateByPrimaryKey(genJob);
                     } catch (Exception e) {
                         setStatus(genJob, STATUS_ERROR);
                         e.printStackTrace();
                         genJob.setErrorMsg("Sever error "+e.getClass().getName());
                         periodJobMapper.updateByPrimaryKey(genJob);
-
                     }
                 }
             }).start();