[Bugfix] fixed confilict job the same time

atms-api/src/main/java/pwc/taxtech/atms/common/util/MyAsserts.java

@@ -18,6 +18,10 @@ public class MyAsserts {
         if (!obj) throw exception;
     }
 
+    public static void  assertNull(Object obj,ApiException exception){
+        if(obj!=null)throw exception;
+    }
+
     public static void assertFalse(boolean obj, ApiException exception) {
         if (obj) throw exception;
     }

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

@@ -478,10 +478,7 @@ public class ReportServiceImpl {
                                            Integer periodParam, Integer reportType, Optional<String> generator) {
         OperationResultDto operationResultDto = new OperationResultDto();
         MyAsserts.assertEq(serviceType, EnumServiceType.VAT, new NotFoundException());
-        PeriodJobExample example = new PeriodJobExample();
-        example.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(periodParam)
-                .andStatusEqualTo(WrapPeriodJobDto.STATUS_BEGIN);
-        MyAsserts.assertEmpty(periodJobMapper.selectByExample(example), Exceptions.TASK_HAS_BEGINNING);
+        MyAsserts.assertNull(periodJobMapper.getRunningJob(projectId,periodParam), Exceptions.TASK_HAS_BEGINNING);
         String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, periodParam);
         MyAsserts.assertTrue(status == null || status.equals(Constant.APPROVAL_DISAGREED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);