霍煤鸿骏平台修改

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

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -51,6 +52,22 @@ public class EntrustReportController 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),
+    })
+    @PostMapping("/page_report_make_his")
+    public RestResult<Page<EntrustReport>> getPageReportMakeHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.CHECK);
+        reportStatusList.add(EntrustReportStatusEnum.ISSUE);
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
+    }
+
+
     @ApiOperation("报告台账待审核分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -63,6 +80,21 @@ public class EntrustReportController 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),
+    })
+    @PostMapping("/page_report_check_his")
+    public RestResult<Page<EntrustReport>> getPageCheckHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.ISSUE);
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
+    }
+
+
     @ApiOperation("报告台账待签发分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -75,6 +107,20 @@ public class EntrustReportController 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),
+    })
+    @PostMapping("/page_report_issue_his")
+    public RestResult<Page<EntrustReport>> getPageIssueHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
+    }
+
+
 
     @ApiOperation("报告电子档案分页列表")
     @ApiImplicitParams({

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

@@ -54,6 +54,20 @@ public class EntrustSampleBackupController 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_back_up_his")
+    public RestResult<Page<EntrustSampleBackupVO>> getPageBackupHis(EntrustSampleBackupVO entrustSampleBackup) {
+        entrustSampleBackup.setNotStatus(EntrustSampleBackupStatusEnum.BACKUP_ING);
+        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+    }
+
+
 
     @ApiOperation("样品处理分页列表")
     @ApiImplicitParams({
@@ -68,6 +82,21 @@ public class EntrustSampleBackupController extends ServiceController {
         return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
     }
 
+
+    @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_handle_his")
+    public RestResult<Page<EntrustSampleBackupVO>> getPageHandleHis(EntrustSampleBackupVO entrustSampleBackup) {
+        entrustSampleBackup.setStatus(EntrustSampleBackupStatusEnum.HANDLE_OK);
+        return success(entrustSampleBackupService.pageVO(getPage(), entrustSampleBackup));
+    }
+
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
+import com.google.common.collect.Lists;
 import com.patzn.cloud.service.hmhj.dto.ReportDTO;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
@@ -64,6 +65,21 @@ 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_make_his")
+    public RestResult<Page<EntrustSampleVO>> getPageMake(EntrustSampleVO entrustSample) {
+        entrustSample.setNotStatus(EntrustSampleStatusEnum.DRAFT);
+        return success(entrustSampleService.pageVO(getPage(), entrustSample));
+    }
+
+
+
     @ApiOperation("报告编制样品分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -137,6 +153,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_receive_his")
+    public RestResult<Page<EntrustSampleVO>> getPageSampleReceiveHis(EntrustSampleVO entrustSample) {
+        entrustSample.setPrepareNotStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
+        return success(entrustSampleService.pageSampleReceive(getPage(), entrustSample));
+    }
+
+
 
     @ApiOperation("任务分配样品分页列表")
     @ApiImplicitParams({
@@ -154,6 +184,28 @@ 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_task_allot_his")
+    public RestResult<Page<EntrustSampleVO>> getPageSampleTaskAllotHis(EntrustSampleVO entrustSample) {
+        entrustSample.setItemStatusList(Lists.newArrayList(
+                EntrustSampleItemStatusEnum.TEST,
+                EntrustSampleItemStatusEnum.UPDATE_APPLY,
+                EntrustSampleItemStatusEnum.CHECK,
+                EntrustSampleItemStatusEnum.AUDIT,
+                EntrustSampleItemStatusEnum.END
+        ));
+        return success(entrustSampleService.pageSampleByItemHis(getPage(), entrustSample));
+    }
+
+
+
+
 
     @ApiOperation("样品生成报告")
     @PostMapping("/make_report")
@@ -260,6 +312,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_input_by_sample_left_his")
+    public RestResult<Page<EntrustSampleVO>> getPageInputByItemLeftHis(EntrustSampleVO sampleVO) {
+        sampleVO.setItemStatusList(Lists.newArrayList(
+                EntrustSampleItemStatusEnum.UPDATE_APPLY,
+                EntrustSampleItemStatusEnum.CHECK,
+                EntrustSampleItemStatusEnum.AUDIT,
+                EntrustSampleItemStatusEnum.END
+        ));
+        return success(entrustSampleService.pageBySampleLeftHis(getPage(), sampleVO));
+    }
+
+
     @ApiOperation("数据复核按照样品复核左侧分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -274,6 +345,24 @@ 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_check_by_sample_left_his")
+    public RestResult<Page<EntrustSampleVO>> getPageCheckByItemLeftHis(EntrustSampleVO sampleVO) {
+        sampleVO.setItemStatusList(Lists.newArrayList(
+                EntrustSampleItemStatusEnum.AUDIT,
+                EntrustSampleItemStatusEnum.END
+        ));
+        return success(entrustSampleService.pageBySampleLeftHis(getPage(), sampleVO));
+    }
+
+
     @ApiOperation("数据审核按照样品审核左侧分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -287,4 +376,20 @@ public class EntrustSampleController extends ServiceController {
         return success(entrustSampleService.pageBySampleLeft(getPage(), sampleVO));
     }
 
+
+    @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_audit_by_sample_left_his")
+    public RestResult<Page<EntrustSampleVO>> getPageAuditByItemLeftHis(EntrustSampleVO sampleVO) {
+        sampleVO.setItemStatusList(Lists.newArrayList(
+                EntrustSampleItemStatusEnum.END
+        ));
+        return success(entrustSampleService.pageBySampleLeftHis(getPage(), sampleVO));
+    }
+
 }

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

@@ -5,6 +5,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.EntrustReport;
+import com.patzn.cloud.service.hmhj.enums.EntrustReportStatusEnum;
 
 import java.io.File;
 import java.util.List;
@@ -32,4 +33,6 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
     boolean backReportCheck(Long[] ids, String reason, Account account);
 
     boolean backReportIssue(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/IEntrustSampleItemService.java

@@ -28,6 +28,7 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     Page<EntrustSampleItemVO> pageByItemLeft(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
 
+
     Page<EntrustSampleItemVO> pageByItemRight(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
 
     boolean submitTest(Long[] ids, Account account);

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

@@ -27,6 +27,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
 
     Page<EntrustSampleVO> pageSampleByItem(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
 
+    Page<EntrustSampleVO> pageSampleByItemHis(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
+
     boolean makeReport(ReportDTO dto, Account account);
 
     boolean submitJudgeRegister(Long[] ids, Account account);
@@ -36,4 +38,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean backJudgeCheck(Long[] ids, String remark, Account account);
 
     Page<EntrustSampleVO> pageBySampleLeft(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO);
+
+    Page<EntrustSampleVO> pageBySampleLeftHis(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO);
+
+    Page<EntrustSampleVO> pageVO(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
 }

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

@@ -39,12 +39,20 @@ public interface IEntrustService extends IBaseService<Entrust> {
 
     Page<EntrustVO> pageEntrustSampleReceive(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustSampleReceiveHis(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustByItem(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustByItemHis(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustBySample(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustByNotSample(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust);
 
+    Page<EntrustVO> pageEntrustByReportHis(Page<EntrustVO> page, EntrustVO entrust);
+
     Page<EntrustVO> pageEntrustJudge(Page<EntrustVO> page, EntrustVO entrust);
 
     boolean outInputSubmitToQualityCheck(Long[] ids, Account account);

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

@@ -56,6 +56,15 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Override
+    public Page<EntrustReport> pageStatus(Page<EntrustReport> page, List<EntrustReportStatusEnum> reportStatusList, EntrustReport entrustReport) {
+        Wrapper wrapper = new EntityWrapper<>(entrustReport);
+        if (CollectionUtils.isNotEmpty(reportStatusList)){
+            wrapper.in("status",reportStatusList);
+        }
+        return this.page(page, wrapper);
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
@@ -200,4 +209,6 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
 
+
+
 }

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<EntrustSampleVO> pageVO(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
+
+        return page.setRecords(baseMapper.selectVOList(page,entrustSample));
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
@@ -183,6 +189,30 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
 
+    @Override
+    public Page<EntrustSampleVO> pageSampleByItemHis(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
+        if (null == entrustSample.getEntrustId()){
+            return page;
+        }
+        if (CollectionUtils.isEmpty(entrustSample.getItemStatusList()) ){
+            return page;
+        }
+        List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("status",entrustSample.getItemStatusList()));
+        if (CollectionUtils.isEmpty(itemList)){
+            return page;
+        }
+
+        List<Long> sampleIdsList = itemList.stream().map(i->{
+            return i.getEntrustSampleId();
+        }).collect(Collectors.toList());
+
+
+        entrustSample.setIds(sampleIdsList);
+
+        return page.setRecords(baseMapper.selectVOList(page,entrustSample));
+    }
+
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -330,6 +360,27 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
 
+
+    @Override
+    public Page<EntrustSampleVO> pageBySampleLeftHis(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO) {
+        if (null == sampleVO.getEntrustId()){
+            return page;
+        }
+        List<EntrustSampleItem> itemList =  entrustSampleItemService.list(Condition.create().in("status",sampleVO.getItemStatusList()));
+        if (CollectionUtils.isEmpty(itemList)){
+            return page;
+        }
+        List<Long> sampleIds =  new ArrayList<>();
+        for (EntrustSampleItem item : itemList) {
+            sampleIds.add(item.getEntrustSampleId());
+        }
+
+
+        sampleVO.setIds(sampleIds);
+        return page.setRecords(baseMapper.selectVOList(page,sampleVO));
+    }
+
+
     public void reportMakeTestContent(XWPFTable xwpfTable, int length, int index, List<?> objList) {
         //检测内容
         Map<Integer, String> map = PoiUtil2007.getCellsContent(xwpfTable, index);

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

@@ -377,6 +377,39 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return page.setRecords(baseMapper.selectEntrustSampleReceive(page,entrust));
     }
 
+
+    @Override
+    public Page<EntrustVO> pageEntrustSampleReceiveHis(Page<EntrustVO> page, EntrustVO entrust) {
+        List<EntrustSamplePrepare> prepareList = entrustSamplePrepareService.list(Condition.create().setSqlSelect("entrust_sample_id").ne("status", EntrustSamplePrepareStatusEnum.RECEIVE));
+
+        if (CollectionUtils.isEmpty(prepareList)){
+            return page;
+        }
+        List<Long> sampleIds = prepareList.stream().map(p->{
+            return p.getEntrustSampleId();
+        }).collect(Collectors.toList());
+
+        if (CollectionUtils.isEmpty(sampleIds)){
+            return page;
+        }
+        List<EntrustSample> entrustSamples = entrustSampleService.getBatchIds(sampleIds);
+        if (CollectionUtils.isEmpty(entrustSamples)){
+            return page;
+        }
+        List<Long> ids = entrustSamples.stream().map(e->{
+            return e.getEntrustId();
+        }).collect(Collectors.toList());
+
+        if (CollectionUtils.isEmpty(ids)){
+            return page;
+        }
+        entrust.setIdsList(ids);
+
+        return page.setRecords(baseMapper.selectEntrustSampleReceive(page,entrust));
+    }
+
+
+
     @Override
     public Page<EntrustVO> pageEntrustByItem(Page<EntrustVO> page, EntrustVO entrust) {
         if (null == entrust.getItemStatus()){
@@ -409,6 +442,40 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return page.setRecords(baseMapper.selectVOList(page,entrust));
     }
 
+
+    @Override
+    public Page<EntrustVO> pageEntrustByItemHis(Page<EntrustVO> page, EntrustVO entrust) {
+        if (CollectionUtils.isEmpty(entrust.getItemStatusEnumList())){
+            return page;
+        }
+        List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("status",entrust.getItemStatusEnumList()));
+        if (CollectionUtils.isEmpty(itemList)){
+            return page;
+        }
+        List<Long> sampleIdsList =   itemList.stream().map(i->{
+            return i.getEntrustSampleId();
+        }).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(sampleIdsList)){
+            return page;
+        }
+        List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().in("id",sampleIdsList));
+        if (CollectionUtils.isEmpty(sampleList)){
+            return page;
+        }
+
+        List<Long> ids = sampleList.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));
+    }
+
+
     @Override
     public Page<EntrustVO> pageEntrustBySample(Page<EntrustVO> page, EntrustVO entrust) {
         RestAssert.fail(null == entrust.getSampleStatus(),"样品状态不能为空");
@@ -428,6 +495,27 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return page.setRecords(baseMapper.selectVOList(page,entrust));
     }
 
+
+    @Override
+    public Page<EntrustVO> pageEntrustByNotSample(Page<EntrustVO> page, EntrustVO entrust) {
+        RestAssert.fail(null == entrust.getNotSampleStatus(),"样品状态不能为空");
+        List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().ne("status",entrust.getNotSampleStatus()));
+
+        if (CollectionUtils.isEmpty(sampleList)){
+            return page;
+        }
+        List<Long> ids = sampleList.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));
+    }
+
+
     @Override
     public Page<EntrustVO> pageEntrustByReport(Page<EntrustVO> page, EntrustVO entrust) {
         RestAssert.fail(null == entrust.getReportStatus(),"报告状态不能为空");
@@ -449,6 +537,26 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
 
     @Override
+    public Page<EntrustVO> pageEntrustByReportHis(Page<EntrustVO> page, EntrustVO entrust) {
+        RestAssert.fail(null == entrust.getReportStatus(),"报告状态不能为空");
+        List<EntrustReport> reportList = entrustReportService.list(Condition.create().in("status",entrust.getReportStatusList()));
+
+        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));
+    }
+
+
+    @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()));

src/main/resources/mapper/hmhj/EntrustSampleBackupMapper.xml

@@ -34,6 +34,11 @@ FROM
             AND b.status =#{vo.status}
         </if>
 
+
+        <if test="null!=vo.notStatus">
+            AND b.status !=#{vo.notStatus}
+        </if>
+
         <if test="null!=vo.sampleName">
             AND s.name LIKE CONCAT('%',#{vo.sampleName},'%')
         </if>

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -3,7 +3,21 @@
 <mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper">
 
     <select id="selectByItemLeftList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-        SELECT name FROM entrust_sample_item WHERE deleted = 0  AND status = #{vo.status}
+        SELECT name FROM entrust_sample_item WHERE deleted = 0
+
+
+
+        <if test="null!=vo.status">
+            AND status = #{vo.status}
+        </if>
+
+        <if test="null!=vo.statusList">
+            AND  status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
 
           <if test="null!=vo.sampleIds">
               AND  entrust_sample_id IN
@@ -34,6 +48,14 @@
             <if test="null!=vo.status">
                 AND status = #{vo.status}
             </if>
+
+        <if test="null!=vo.statusList">
+            AND  status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
             <if test="null!=vo.name">
                 AND name = #{vo.name}
             </if>
@@ -82,6 +104,15 @@
             AND status = #{vo.status}
         </if>
 
+        <if test="null!=vo.statusList">
+            AND status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
+
+
         <if test="null!=vo.sampleIds">
             AND  entrust_sample_id IN
             <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">

src/main/resources/mapper/hmhj/EntrustSampleMapper.xml

@@ -19,6 +19,10 @@
             AND p.status = #{vo.prepareStatus}
         </if>
 
+        <if test="null!=vo.prepareNotStatus">
+            AND p.status != #{vo.prepareNotStatus}
+        </if>
+
         <if test="null!=vo.entrustId">
             AND s.entrust_id = #{vo.entrustId}
         </if>
@@ -29,11 +33,19 @@
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
 
-        SELECT id , name ,code,entrust_id  FROM entrust_sample WHERE deleted = 0
+        SELECT *  FROM entrust_sample WHERE deleted = 0
         <if test="null!=vo.entrustId">
             AND  entrust_id = #{vo.entrustId}
         </if>
 
+        <if test="null!=vo.status">
+            AND  status = #{vo.status}
+        </if>
+
+        <if test="null!=vo.notStatus">
+            AND  status != #{vo.notStatus}
+        </if>
+
         <if test="null!=vo.ids">
             AND  id IN
             <foreach collection="vo.ids" index="index" item="sampleId" open="(" separator="," close=")">