霍煤鸿骏优化

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustReportService.java

@@ -28,11 +28,23 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
 
     boolean submitReportCheck(Long[] ids, Account account);
 
+    boolean submitFromAllowToSend(Long[] ids, Account account);
+
+    boolean submitFromAllowToIssue(Long[] ids, Account account);
+
+    boolean submitFromSendToJudge(Long[] ids, Account account);
+
     boolean submitReportIssue(Long[] ids, Account account);
 
     boolean backReportCheck(Long[] ids, String reason, Account account);
 
     boolean backReportIssue(Long[] ids, String reason, Account account);
 
+    boolean backFromReportSendToAllow(Long[] ids, String reason, Account account);
+
+    boolean backFromReportAllowToCheck(Long[] ids, String reason, Account account);
+
+    boolean backFromReportIssueToAllow(Long[] ids, String reason, Account account);
+
     Page<EntrustReport> pageStatus(Page<EntrustReport> page, List<EntrustReportStatusEnum> reportStatusList, EntrustReport entrustReport);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java

@@ -140,6 +140,67 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
 
         EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.ALLOW);
+        report.setProgress(EntrustReportStatusEnum.ALLOW);
+
+        List<EntrustReportRelSample> relSamples = entrustReportRelSampleService.list(Condition.create().in("report_id",ids));
+
+        if (CollectionUtils.isNotEmpty(relSamples)){
+            List<Long> sampleIds = relSamples.stream().map(s->{
+                return s.getSampleId();
+            }).collect(Collectors.toList());
+
+            if (CollectionUtils.isNotEmpty(sampleIds)){
+                EntrustSample sample = new EntrustSample();
+
+                sample.setStatus(EntrustSampleStatusEnum.REPORT_ALLOW);
+                sample.setProgress(EntrustSampleStatusEnum.REPORT_ALLOW);
+                entrustSampleService.update(sample,Condition.create().in("id",sampleIds));
+            }
+        }
+
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitFromAllowToSend(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
+
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.SEND);
+        report.setProgress(EntrustReportStatusEnum.SEND);
+
+        List<EntrustReportRelSample> relSamples = entrustReportRelSampleService.list(Condition.create().in("report_id",ids));
+
+        if (CollectionUtils.isNotEmpty(relSamples)){
+            List<Long> sampleIds = relSamples.stream().map(s->{
+                return s.getSampleId();
+            }).collect(Collectors.toList());
+
+            if (CollectionUtils.isNotEmpty(sampleIds)){
+                EntrustSample sample = new EntrustSample();
+
+                sample.setStatus(EntrustSampleStatusEnum.REPORT_SEND);
+                sample.setProgress(EntrustSampleStatusEnum.REPORT_SEND);
+                entrustSampleService.update(sample,Condition.create().in("id",sampleIds));
+            }
+        }
+
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitFromAllowToIssue(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
+
+        EntrustReport report = new EntrustReport();
         report.setStatus(EntrustReportStatusEnum.ISSUE);
         report.setProgress(EntrustReportStatusEnum.ISSUE);
 
@@ -164,6 +225,35 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
 
     @Transactional(rollbackFor = Exception.class)
     @Override
+    public boolean submitFromSendToJudge(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
+
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.END);
+        report.setProgress(EntrustReportStatusEnum.END);
+
+        List<EntrustReportRelSample> relSamples = entrustReportRelSampleService.list(Condition.create().in("report_id",ids));
+
+        if (CollectionUtils.isNotEmpty(relSamples)){
+            List<Long> sampleIds = relSamples.stream().map(s->{
+                return s.getSampleId();
+            }).collect(Collectors.toList());
+
+            if (CollectionUtils.isNotEmpty(sampleIds)){
+                EntrustSample sample = new EntrustSample();
+
+                sample.setStatus(EntrustSampleStatusEnum.END);
+                sample.setProgress(EntrustSampleStatusEnum.END);
+                entrustSampleService.update(sample,Condition.create().in("id",sampleIds));
+            }
+        }
+
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
     public boolean submitReportIssue(Long[] ids, Account account) {
         RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的报告");
 
@@ -209,6 +299,37 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
 
+    @Override
+    public boolean backFromReportSendToAllow(Long[] ids, String reason, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要退回的报告");
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.ALLOW);
+        report.setProgress(EntrustReportStatusEnum.BACK_SEND);
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+
+
+
+    @Override
+    public boolean backFromReportAllowToCheck(Long[] ids, String reason, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要退回的报告");
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.CHECK);
+        report.setProgress(EntrustReportStatusEnum.BACK_ALLOW);
+        return super.update(report, Condition.create().in("id",ids));
+    }
+
+
+
+    @Override
+    public boolean backFromReportIssueToAllow(Long[] ids, String reason, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要退回的报告");
+        EntrustReport report = new EntrustReport();
+        report.setStatus(EntrustReportStatusEnum.ALLOW);
+        report.setProgress(EntrustReportStatusEnum.BACK_ISSUE);
+        return super.update(report, Condition.create().in("id",ids));
+    }
 
 
 }