霍煤宏骏

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

@@ -575,7 +575,7 @@ public class EntrustController extends ServiceController {
                 EntrustReportStatusEnum.REPORT_PRINT,
                 EntrustReportStatusEnum.END
         ));
-        return success(entrustService.pageEntrustByReport(getPage(), entrust));
+        return success(entrustService.pageEntrustByReportHis(getPage(), entrust));
     }
 
 
@@ -595,6 +595,23 @@ public class EntrustController 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_entrust_judge_his")
+    public RestResult<Page<EntrustVO>> getPageEntrustJudgeHis(EntrustVO entrust) {
+        entrust.setSampleStatus(EntrustSampleStatusEnum.END);
+        entrust.setJudgeStatusList(Lists.newArrayList(
+                1,2
+        ));
+        return success(entrustService.pageEntrustJudgeHis(getPage(), entrust));
+    }
+
+
     @ApiOperation("质量判定审核委托分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -610,6 +627,22 @@ public class EntrustController 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_entrust_judge_check_his")
+    public RestResult<Page<EntrustVO>> getPageEntrustJudgeCheckHis(EntrustVO entrust) {
+        entrust.setSampleStatus(EntrustSampleStatusEnum.END);
+        entrust.setJudgeStatus(2);
+        return success(entrustService.pageEntrustJudge(getPage(), entrust));
+    }
+
+
+
     @ApiOperation("电子档案委托分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.google.common.collect.Lists;
 import com.patzn.cloud.service.hmhj.dto.ReportDTO;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
@@ -230,6 +232,22 @@ 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_his")
+    public RestResult<Page<EntrustSample>> getPageSampleMakeHis(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.END);
+        Wrapper wrapper = new EntityWrapper<>(entrustSample);
+        wrapper.in("judge_status",Lists.newArrayList(1,2));
+        return success(entrustSampleService.pageByWrapper(getPage(), wrapper));
+    }
+
+
     @ApiOperation("质量判定审核样品分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -245,6 +263,20 @@ 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_check_his")
+    public RestResult<Page<EntrustSample>> getPageSampleMakeCheckHis(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.END);
+        entrustSample.setJudgeStatus(2);
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
 
     @ApiOperation("电子档案样品分页列表")
     @ApiImplicitParams({

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

 package com.patzn.cloud.service.lims.hmhj.service;
 
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
@@ -19,6 +20,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
 
     Page<EntrustSample> page(Page<EntrustSample> page, EntrustSample entrustSample);
 
+    Page<EntrustSample> pageByWrapper(Page<EntrustSample> page, Wrapper wrapper);
+
     boolean removeByIds(List<Long> ids);
 
     List<EntrustSampleVO> obtainMakeInfo(Long[] ids, Account account);

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

@@ -57,6 +57,8 @@ public interface IEntrustService extends IBaseService<Entrust> {
 
     Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustJudgeHis(Page<EntrustVO> page, EntrustVO entrust);
+
     boolean outInputSubmitToQualityCheck(Long[] ids, Account account);
 
     Page<EntrustVO> pageVO(Page<EntrustVO> page, EntrustVO entrust);

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

@@ -84,6 +84,12 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
     @Override
+    public Page<EntrustSample> pageByWrapper(Page<EntrustSample> page,  Wrapper wrapper) {
+
+        return this.page(page, wrapper);
+    }
+
+    @Override
     public Page<EntrustSampleVO> pageVO(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
 
         return page.setRecords(baseMapper.selectVOList(page,entrustSample));

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

@@ -597,6 +597,25 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return page.setRecords(baseMapper.selectVOList(page,entrust));
     }
 
+
+    @Override
+    public Page<EntrustVO> pageEntrustJudgeHis(Page<EntrustVO> page, EntrustVO entrust) {
+        List<EntrustSample> reportList = entrustSampleService.list(Condition.create().eq("status",entrust.getSampleStatus()).in("judge_status",entrust.getJudgeStatusList()));
+
+        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));
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean outInputSubmitToQualityCheck(Long[] ids, Account account) {