[Bugfix] fixed init formual status

atms-api/src/main/java/pwc/taxtech/atms/controller/ReportController.java

@@ -47,8 +47,11 @@ public class ReportController {
 
     @RequestMapping(value = "getRunningJob/{projectId}/{period}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
-    public PeriodJob getRunningJob(@PathVariable String projectId, @PathVariable Integer period) {
-        return reportService.getRunningJob(projectId, period);
+    public PeriodJobDto getRunningJob(@PathVariable String projectId, @PathVariable Integer period) {
+        PeriodJob job = reportService.getRunningJob(projectId, period);
+        if (job != null)
+            return new PeriodJobDto().copyFromPeriodJob(job);
+        else return null;
     }
 
     @RequestMapping(value = "getJobStatus/{projectId}//{period}/{jobId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/PeriodJobDto.java

@@ -46,10 +46,9 @@ public class PeriodJobDto {
             if (Collections.isEmpty(tasks)) this.jobStatus = STATUS_BEGIN;
             else {
                 String[] codes = stepsCode.split(",");
-                if (tasks.size() < codes.length) this.jobStatus = STATUS_RUNNING;
-                else {
-                    this.jobStatus = tasks.stream().anyMatch(m -> m.status.equals(STATUS_ERROR)) ? STATUS_ERROR : STATUS_END;
-                }
+                if (tasks.stream().anyMatch(m -> m.status.equals(STATUS_ERROR))) this.jobStatus = STATUS_ERROR;
+                else if (tasks.size() < codes.length) this.jobStatus = STATUS_RUNNING;
+                else this.jobStatus = STATUS_END;
             }
         }
 

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodJobMapper.java

@@ -120,7 +120,7 @@ public interface PeriodJobMapper extends MyVatMapper {
             "FROM " +
             " PERIOD_JOB  " +
             "WHERE " +
-            " STATUS = 'Begin'  " +
+            " STATUS LIKE '%Begin%'  " +
             " AND PROJECT_ID = #{projectId}  " +
             " AND PERIOD =#{period}")
     PeriodJob getRunningJob(@Param("projectId") String projectId, @Param("period") Integer period);