土工平台修改

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java

@@ -287,4 +287,20 @@ public class EntrustController extends ServiceController {
         return success(entrustService.pageEntrustByReport(getPage(), entrust));
     }
 
+
+
+    @ApiOperation("质量判定委托分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_entrust_judge")
+    public RestResult<Page<EntrustVO>> getPageEntrustJudge(EntrustVO entrust) {
+        entrust.setSampleStatus(EntrustSampleStatusEnum.END);
+        entrust.setJudgeStatus(0);
+        return success(entrustService.pageEntrustJudge(getPage(), entrust));
+    }
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleController.java

@@ -163,4 +163,25 @@ public class EntrustSampleController extends ServiceController {
 
 
 
+    @ApiOperation("质量判定样品分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_sample_judge")
+    public RestResult<Page<EntrustSample>> getPageSampleMake(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.END);
+        entrustSample.setJudgeStatus(0);
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
+
+    @ApiOperation("质量登记提交")
+    @PostMapping("/submit_judge_register")
+        public RestResult<Boolean> submitJudgeRegister(@RequestParam("ids") Long [] ids) {
+        return success(entrustSampleService.submitJudgeRegister(ids,getAccount()));
+    }
+
 }

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

@@ -28,4 +28,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     Page<EntrustSampleVO> pageSampleByItem(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
 
     boolean makeReport(ReportDTO dto, Account account);
+
+    boolean submitJudgeRegister(Long[] ids, Account account);
 }

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

@@ -42,4 +42,6 @@ public interface IEntrustService extends IBaseService<Entrust> {
     Page<EntrustVO> pageEntrustBySample(Page<EntrustVO> page, EntrustVO entrust);
 
     Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust);
+
+    Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust);
 }

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

@@ -10,11 +10,14 @@ import com.patzn.cloud.oss.starter.OssFileResult;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.EntrustReport;
 import com.patzn.cloud.service.hmhj.entity.EntrustReportRelSample;
+import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
+import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportRelSampleService;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustReportService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -26,6 +29,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 报告表 服务实现类
@@ -40,6 +44,9 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     private OssClient ossClient;
     @Autowired
     private IEntrustReportRelSampleService entrustReportRelSampleService;
+    @Autowired
+    private IEntrustSampleService entrustSampleService;
+
 
     @Override
     public Page<EntrustReport> page(Page<EntrustReport> page, EntrustReport entrustReport) {
@@ -96,6 +103,24 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         EntrustReport report = new EntrustReport();
         report.setStatus(EntrustReportStatusEnum.CHECK);
         report.setProgress(EntrustReportStatusEnum.CHECK);
+
+        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_CHECK);
+                sample.setProgress(EntrustSampleStatusEnum.REPORT_CHECK);
+                entrustSampleService.update(sample,Condition.create().in("id",sampleIds));
+            }
+        }
+
+
         return super.update(report, Condition.create().in("id",ids));
     }
 
@@ -108,6 +133,23 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         EntrustReport report = new EntrustReport();
         report.setStatus(EntrustReportStatusEnum.ISSUE);
         report.setProgress(EntrustReportStatusEnum.ISSUE);
+
+        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_ISSUE);
+                sample.setProgress(EntrustSampleStatusEnum.REPORT_ISSUE);
+                entrustSampleService.update(sample,Condition.create().in("id",sampleIds));
+            }
+        }
+
         return super.update(report, Condition.create().in("id",ids));
     }
 
@@ -119,6 +161,21 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         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));
     }
 

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

@@ -274,6 +274,15 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         return true;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitJudgeRegister(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的质量登记数据");
+        EntrustSample sample = new EntrustSample();
+        sample.setJudgeStatus(1);
+        sample.setJudgeProgress(1);
+        return super.update(sample,Condition.create().in("id",ids));
+    }
 
 
     public void reportMakeTestContent(XWPFTable xwpfTable, int length, int index, List<?> objList) {

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

@@ -435,5 +435,25 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     }
 
 
+    @Override
+    public Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust) {
+        RestAssert.fail(null == entrust.getSampleStatus(),"样品状态不能为空");
+        List<EntrustSample> reportList = entrustSampleService.list(Condition.create().eq("status",entrust.getSampleStatus()).eq("judge_status",entrust.getJudgeStatus()));
+
+        if (CollectionUtils.isEmpty(reportList)){
+            return page;
+        }
+        List<Long> ids = reportList.stream().map(s->{
+            return s.getEntrustId();
+        }).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(ids)){
+            return page;
+        }
+
+        entrust.setIdsList(ids);
+        return page.setRecords(baseMapper.selectVOList(page,entrust));
+    }
+
+
 
 }