添加采样管理相关功能；

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

@@ -86,7 +86,6 @@ public class ContractInfoController extends ServiceController {
     @ApiOperation("添加")
     @PostMapping("/")
     public RestResult<Boolean> add(ContractInfo contractInfo) {
-        contractInfo.setPeriod(userInfoService.getUserPeriod(getAccount()));
         return success(contractInfoService.save(contractInfo));
     }
 
@@ -94,7 +93,6 @@ public class ContractInfoController extends ServiceController {
     @ApiOperation("添加")
     @PostMapping("/add_contract")
     public RestResult<Boolean> addDTO(@RequestBody ContractInfoDTO dto) {
-        dto.setPeriod(userInfoService.getUserPeriod(getAccount()));
         return success(contractInfoService.addDTO(dto));
     }
 

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

@@ -262,6 +262,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_check_accept_reg_his")
     public RestResult<Page<ContractSampleVO>> getPageCheckAcceptRegHis(ContractSampleVO contractSample) {
         List<ContractSampleStatusEnum> statusList = new ArrayList<>();
+        statusList.add(ContractSampleStatusEnum.DATA_SAMPLING);
         statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
         statusList.add(ContractSampleStatusEnum.OUT_DRIFT);
         statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
@@ -269,6 +270,59 @@ public class ContractSampleController extends ServiceController {
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
+    // =========================采样管理 start =================================
+    @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_data_sampling")
+    public RestResult<Page<ContractSampleVO>> getPageDataSampling(ContractSampleVO contractSample) {
+        contractSample.setStatus(ContractSampleStatusEnum.DATA_SAMPLING);
+        contractSample.setCurrUserId(getAccount().getUserId());
+        return success(contractSampleService.pageVO(getPage(), contractSample));
+    }
+
+
+    @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_data_sampling_wait")
+    public RestResult<Page<ContractSampleVO>> getPageDataSamplingWait(ContractSampleVO contractSample) {
+        contractSample.setStatusList(Lists.newArrayList(
+                ContractSampleStatusEnum.DATA_SAMPLING,
+                ContractSampleStatusEnum.OUT_DRIFT,
+                ContractSampleStatusEnum.ENTRUST_REG
+        ));
+        contractSample.setType(2);
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), HmConst.ACCEPTANCE_ROOM));
+        return success(contractSampleService.pageVO(getPage(), contractSample));
+    }
+
+    @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_data_sampling_his")
+    public RestResult<Page<ContractSampleVO>> getPageDataSamplingHis(ContractSampleVO contractSample) {
+        List<ContractSampleStatusEnum> statusList = new ArrayList<>();
+        statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+        statusList.add(ContractSampleStatusEnum.OUT_DRIFT);
+        statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
+        contractSample.setStatusList(statusList);
+        return success(contractSampleService.pageVO(getPage(), contractSample));
+    }
+    // =========================采样管理 end ===================================
+
 
     @ApiOperation("验收组织分页列表")
     @ApiImplicitParams({
@@ -324,6 +378,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_expert_review")
     public RestResult<Page<ContractSampleVO>> getPageExpertReview(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.EXPERT_REVIEW);
+        contractSample.setAcceptorId(getAccount().getUserId());
         return success(contractSampleService.pageExpertReview(getPage(), contractSample));
     }
 
@@ -476,14 +531,22 @@ public class ContractSampleController extends ServiceController {
     }
 
 
-    @ApiOperation("验收任务登记提交至委托登记")
+    // @ApiOperation("验收任务登记提交至委托登记")
+    @ApiOperation("采样管理提交至委托登记")
     @PostMapping("/submit_to_entrust_org")
     public RestResult<Boolean> submitToEntrustOrg(@RequestParam("ids") Long[] ids) {
         return success(contractSampleService.submitToEntrustOrg(ids, getAccount()));
     }
 
+    @ApiOperation("验收任务登记提交至采样管理")
+    @PostMapping("/submit_to_data_sampling")
+    public RestResult<Boolean> submitToDataSampling(@RequestParam("ids") Long[] ids) {
+        return success(contractSampleService.submitToDataSampling(ids, getAccount()));
+    }
+
 
-    @ApiOperation("验收任务登记提交至外委登记")
+    // @ApiOperation("验收任务登记提交至外委登记")
+    @ApiOperation("采样管理提交至外委登记")
     @PostMapping("/submit_to_out_reg")
     public RestResult<Boolean> submitToOutReg(@RequestParam("ids") Long[] ids) {
         return success(contractSampleService.submitToOutReg(ids, getAccount()));

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

+package com.patzn.cloud.service.lims.hmhj.controller;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.patzn.cloud.commons.api.RestConstants;
+import com.patzn.cloud.commons.api.RestResult;
+import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.hmhj.entity.ContractSampling;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSamplingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 合同样品控制器
+ */
+@Api(tags = "合同样品")
+@RestController
+@RequestMapping("/v1/contract_sampling")
+public class ContractSamplingController extends ServiceController {
+
+    @Autowired
+    private IContractSamplingService contractSamplingService;
+
+    @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")
+    public RestResult<Page<ContractSampling>> getPage(ContractSampling contractSampling) {
+        return success(contractSamplingService.page(getPage(), contractSampling));
+    }
+
+    @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")
+    public RestResult<Page<ContractSampling>> getPageMake(ContractSampling contractSampling) {
+        if (null == contractSampling.getContractSampleId()) {
+            return success(null);
+        }
+        return success(contractSamplingService.page(getPage(), contractSampling));
+    }
+
+    @ApiOperation("查询 id 信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @GetMapping("/{id}")
+    public RestResult<ContractSampling> get(@PathVariable("id") Long id) {
+        return success(contractSamplingService.getById(id));
+    }
+
+    @ApiOperation("根据 id 修改信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
+    })
+    @PutMapping("/{id}")
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, ContractSampling contractSampling) {
+        contractSampling.setId(id);
+        return success(contractSamplingService.updateSampling(contractSampling));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/")
+    public RestResult<Boolean> add(ContractSampling contractSampling) {
+        return success(contractSamplingService.save(contractSampling));
+    }
+
+    @ApiOperation("批量添加或修改")
+    @PostMapping("/add_batch")
+    public RestResult<Boolean> add(@RequestBody List<ContractSampling> sampleList) {
+        return success(contractSamplingService.saveOrUpdateInfoBatch(sampleList));
+    }
+
+    @ApiOperation("根据 ids 删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
+    })
+    @DeleteMapping("/")
+    public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+        return success(contractSamplingService.removeByIds(ids));
+    }
+
+}

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

@@ -216,6 +216,12 @@ public class EntrustSampleController extends ServiceController {
         return success(entrustSampleService.save(entrustSample));
     }
 
+    @ApiOperation("批量添加或修改")
+    @PostMapping("/add_batch")
+    public RestResult<Boolean> add(@RequestBody List<EntrustSample> sampleList) {
+        return success(entrustSampleService.saveOrUpdateInfoBatch(sampleList));
+    }
+
     @ApiOperation("根据 ids 删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ContractSamplingMapper.java

+package com.patzn.cloud.service.lims.hmhj.mapper;
+
+import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.ContractSampling;
+import com.patzn.cloud.service.hmhj.vo.ContractSamplingVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
+
+/**
+ * @title: 合同样品 Mapper
+ * @author: meazty
+ * @ondate: 2021/9/23 17:12
+ **/
+public interface ContractSamplingMapper extends BatchMapper<ContractSampling> {
+
+    List<ContractSamplingVO> selectVOList(RowBounds rowBounds, @Param("vo") ContractSamplingVO contractSamplingVO);
+
+}

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

@@ -84,4 +84,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     boolean addByContractInfo(ContractSampleDTO contractSampleDTO);
 
     Page<ContractSampleVO> pageExpertReview(Page<ContractSampleVO> page, ContractSampleVO contractSample);
+
+    boolean submitToDataSampling(Long[] ids, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSamplingService.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.service.IBaseService;
+import com.patzn.cloud.service.hmhj.entity.ContractSampling;
+import com.patzn.cloud.service.hmhj.vo.ContractSamplingVO;
+
+import java.util.List;
+
+/**
+ * @title: 合同样品表
+ * @author: meazty
+ * @ondate: 2021/9/23 17:17
+ **/
+public interface IContractSamplingService extends IBaseService<ContractSampling> {
+
+    Page<ContractSampling> page(Page<ContractSampling> page, ContractSampling contractSampling);
+
+    Page<ContractSampling> pageByWrapper(Page<ContractSampling> page, Wrapper wrapper);
+
+    boolean removeByIds(List<Long> ids);
+
+    Page<ContractSamplingVO> pageVO(Page<ContractSamplingVO> page, ContractSamplingVO contractSampling);
+
+    List<ContractSampling> getByContractId(Long contractId);
+
+    boolean saveOrUpdateInfoBatch(List<ContractSampling> sampleList);
+
+    boolean updateSampling(ContractSampling contractSampling);
+}

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

@@ -4,11 +4,17 @@ 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;
-import com.patzn.cloud.service.hmhj.dto.*;
+import com.patzn.cloud.service.hmhj.dto.EntrustSampleADDDTO;
+import com.patzn.cloud.service.hmhj.dto.QueryDTO;
+import com.patzn.cloud.service.hmhj.dto.ReportDTO;
+import com.patzn.cloud.service.hmhj.dto.StatsQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.EntrustFlowEnum;
-import com.patzn.cloud.service.hmhj.vo.*;
+import com.patzn.cloud.service.hmhj.vo.AlTasteStatsVO;
+import com.patzn.cloud.service.hmhj.vo.ElectrolyteRatioStatsVO;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
+import com.patzn.cloud.service.hmhj.vo.ReportSampleVO;
 
 import java.util.List;
 import java.util.Map;
@@ -120,4 +126,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     String getNewCode(String queryKey, int lens);
 
     EntrustSample getByContractId(Long contractId);
+
+    boolean saveOrUpdateInfoBatch(List<EntrustSample> sampleList);
 }

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

@@ -260,8 +260,12 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         ContractSample contractSample = new ContractSample();
         contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
         contractSample.setProgress(ContractSampleStatusEnum.ENTRUST_REG);
-        contractSampleRecordService.record(ids, ContractSampleStatusEnum.CHECK_ACCEPT_REG, ContractSampleStatusEnum.ENTRUST_REG, 0, "验收任务登记提交至委托登记", account);
-        lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register", "委托登记由验收任务登记提交过来，请及时处理", "新的委托登记任务！", account, null);
+        // contractSampleRecordService.record(ids, ContractSampleStatusEnum.CHECK_ACCEPT_REG, ContractSampleStatusEnum.ENTRUST_REG, 0, "验收任务登记提交至委托登记", account);
+        // lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register", "委托登记由验收任务登记提交过来，请及时处理", "新的委托登记任务！", account, null);
+        // return super.update(contractSample, Condition.create().in("id", ids));
+
+        contractSampleRecordService.record(ids, ContractSampleStatusEnum.DATA_SAMPLING, ContractSampleStatusEnum.ENTRUST_REG, 0, "采样管理提交至委托登记", account);
+        lmsMsgService.sendMsg("/hmhj/entrust_manage/entrust_register", "委托登记由采样管理提交过来，请及时处理", "新的委托登记任务！", account, null);
         return super.update(contractSample, Condition.create().in("id", ids));
     }
 
@@ -273,8 +277,10 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         ContractSample contractSample = new ContractSample();
         contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
         contractSample.setProgress(ContractSampleStatusEnum.OUT_DRIFT);
-        contractSampleRecordService.record(ids, ContractSampleStatusEnum.CHECK_ACCEPT_REG, ContractSampleStatusEnum.OUT_DRIFT, 0, "验收任务登记提交外委登记", account);
-        lmsMsgService.sendMsg("/hmhj/accept_manage/sub_register", "验收任务登记提交至外委登记，请及时处理", "新的外委登记任务！", account, null);
+        // contractSampleRecordService.record(ids, ContractSampleStatusEnum.CHECK_ACCEPT_REG, ContractSampleStatusEnum.OUT_DRIFT, 0, "验收任务登记提交外委登记", account);
+        // lmsMsgService.sendMsg("/hmhj/accept_manage/sub_register", "验收任务登记提交至外委登记，请及时处理", "新的外委登记任务！", account, null);
+        contractSampleRecordService.record(ids, ContractSampleStatusEnum.DATA_SAMPLING, ContractSampleStatusEnum.OUT_DRIFT, 0, "采样管理提交外委登记", account);
+        lmsMsgService.sendMsg("/hmhj/accept_manage/sub_register", "采样管理提交至外委登记，请及时处理", "新的外委登记任务！", account, null);
         return super.update(contractSample, Condition.create().in("id", ids));
     }
 
@@ -707,4 +713,16 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     public Page<ContractSampleVO> pageExpertReview(Page<ContractSampleVO> page, ContractSampleVO contractSample) {
         return page.setRecords(baseMapper.selectExpertReviewList(page, contractSample));
     }
+
+    @Override
+    public boolean submitToDataSampling(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的合同！");
+        ContractSample contractSample = new ContractSample();
+        contractSample.setStatus(ContractSampleStatusEnum.DATA_SAMPLING);
+        contractSample.setProgress(ContractSampleStatusEnum.DATA_SAMPLING);
+        contractSampleRecordService.record(ids, ContractSampleStatusEnum.CHECK_ACCEPT_REG, ContractSampleStatusEnum.DATA_SAMPLING, 0, "验收任务登记提交至采样管理", account);
+        lmsMsgService.sendMsg("/hmhj/sampling_manage/sampling_list", "采样任务由验收任务登记提交过来，请及时处理", "新的采样任务！", account, null);
+        return super.update(contractSample, Condition.create().in("id", ids));
+    }
+
 }

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.cloud.service.hmhj.entity.ContractSampling;
+import com.patzn.cloud.service.hmhj.vo.ContractSamplingVO;
+import com.patzn.cloud.service.lims.hmhj.mapper.ContractSamplingMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSamplingService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author wwd
+ * @since 2021-02-01
+ */
+@Service
+public class ContractSamplingServiceImpl extends BaseServiceImpl<ContractSamplingMapper, ContractSampling> implements IContractSamplingService {
+
+    @Override
+    public Page<ContractSampling> page(Page<ContractSampling> page, ContractSampling contractSampling) {
+        Wrapper wrapper = new EntityWrapper<>(contractSampling);
+        wrapper.orderDesc(Collections.singleton("ctime"));
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public Page<ContractSampling> pageByWrapper(Page<ContractSampling> page, Wrapper wrapper) {
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public Page<ContractSamplingVO> pageVO(Page<ContractSamplingVO> page, ContractSamplingVO contractSampling) {
+        return page.setRecords(baseMapper.selectVOList(page, contractSampling));
+    }
+
+    @Override
+    public boolean removeByIds(List<Long> ids) {
+        // contractSamplingItemService.remove(Condition.create().in("entrust_sample_id", ids));
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public List<ContractSampling> getByContractId(Long contractId) {
+        if (null == contractId) {
+            return null;
+        }
+        return list(Condition.create().eq("contract_sample_id", contractId));
+    }
+
+    @Override
+    public boolean saveOrUpdateInfoBatch(List<ContractSampling> sampleList) {
+        RestAssert.fail(CollectionUtils.isEmpty(sampleList), "样品信息为空");
+        sampleList.forEach(t -> {
+            RestAssert.fail(null == t.getType(), "样品类型为空");
+            RestAssert.fail(StringUtils.isBlank(t.getName()), "样品名称为空");
+        });
+        return saveOrUpdateBatch(sampleList);
+    }
+
+    @Override
+    public boolean updateSampling(ContractSampling contractSampling) {
+        return updateById(contractSampling);
+    }
+}
\ No newline at end of file

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

@@ -1941,4 +1941,11 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         List<EntrustSample> sampleList = list(Condition.create().eq("contract_sample_id", contractId));
         return CollectionUtils.isEmpty(sampleList) ? null : sampleList.get(0);
     }
+
+    @Override
+    public boolean saveOrUpdateInfoBatch(List<EntrustSample> sampleList) {
+        RestAssert.fail(CollectionUtils.isEmpty(sampleList), "样品信息为空");
+
+        return false;
+    }
 }
\ No newline at end of file

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

@@ -98,6 +98,9 @@
         join contract_ok_organizer o on o.contract_sample_id = s.id
         WHERE s.deleted = 0 and o.deleted = 0
         <include refid="sqlWhere"/>
+        <if test="null != vo.acceptorId ">
+            and o.user_id = #{vo.acceptorId}
+        </if>
         and o.acceptance_result is null
         order by s.ctime desc
     </select>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleMapper">
+
+
+    <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSamplingVO">
+        SELECT
+            s.*
+        FROM contract_sampling s WHERE deleted = 0
+
+        <if test="null != vo.contractSampleId">
+            AND s.contract_sample_id = #{vo.contractSampleId}
+        </if>
+
+        <if test="null != vo.code">
+            AND s.code LIKE CONCAT('%',#{vo.code},'%')
+        </if>
+
+        <if test="null != vo.type">
+            AND s.type = #{vo.type}
+        </if>
+
+        <if test="null != vo.ids">
+            AND s.id IN
+            <foreach collection="vo.ids" index="index" item="sampleId" open="(" separator="," close=")">
+                #{sampleId}
+            </foreach>
+        </if>
+
+        order by s.order_by asc, s.code ,s.ctime desc
+    </select>
+
+</mapper>

src/test/java/resources/db_sql/base/v168/20210923__添加菜单、按钮.sql

-/** created by meazty on 2021/9/23 11:31 **/
+/** created by meazty on 2021/9/23 11:31 **/
@@ -7,3 +7,7 @@ INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "
 INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440616475415465985, 1356148880450674689, 1440613780998770690, '操作日志-历史', 1, 'quality-check-his-CZRZ', '/', NULL, NULL, 1, 1, '2021-09-22 17:58:27.763', NULL);
 INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440613780998770690, 1356148880450674689, 1365114902096551938, '质检审核', 0, 'quality_check', '/hmhj/report_manage/quality_check', 'pt-config', NULL, 1, 5, '2021-09-22 17:47:45.37', NULL);
 INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440574880200708098, 1356148880450674689, 1359066545217511426, '验收专家配置', 0, 'check_expert', '/hmhj/sys_config/check_expert', 'pt-config', NULL, 1, 1, '2021-09-22 15:13:10.699', NULL);
+----
+----
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440927980174364674, 1356148880450674689, 1440927491810578433, '采样管理', 0, 'sampling_list', '/hmhj/sampling_manage/sampling_list', 'pt-config', NULL, 1, 1000, '2021-09-23 14:36:16.288', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1440927491810578433, 1356148880450674689, 1356165846578126849, '采样管理', 0, '/', '/', 'pt-config', NULL, 1, 8800, '2021-09-23 14:34:19.853', NULL);

src/test/java/resources/db_sql/hmhj/v168/20210923__添加合同样品表.sql

+/** created by meazty on 2021/9/22 13:42 **/
+/** created by meazty on 2021/9/22 13:42 **/
+-- ----------------------------
+-- Table structure for acceptance_expert
+-- ----------------------------
+DROP TABLE IF EXISTS "public"."contract_sampling";
+CREATE TABLE "public"."contract_sampling" (
+                                              "id" int8 NOT NULL,
+                                              "name" varchar(120) COLLATE "pg_catalog"."default",
+                                              "company_id" int8,
+                                              "uid" int8,
+                                              "ctime" timestamp(0),
+                                              "ltime" timestamp(0),
+                                              "lid" int8,
+                                              "deleted" int2 DEFAULT 0,
+                                              "entrust_id" int8,
+                                              "code" varchar(120) COLLATE "pg_catalog"."default",
+                                              "sample_shape" varchar(100) COLLATE "pg_catalog"."default",
+                                              "sample_quantity" varchar(120) COLLATE "pg_catalog"."default",
+                                              "standard" varchar(120) COLLATE "pg_catalog"."default",
+                                              "status" int2 DEFAULT 0,
+                                              "progress" int2 DEFAULT 0,
+                                              "receiver" varchar(100) COLLATE "pg_catalog"."default",
+                                              "receiver_id" int8,
+                                              "receive_time" timestamp(6),
+                                              "sample_grading" varchar(150) COLLATE "pg_catalog"."default",
+                                              "quality_registration" varchar(150) COLLATE "pg_catalog"."default",
+                                              "ok_judge" varchar(150) COLLATE "pg_catalog"."default",
+                                              "judger_id" int8,
+                                              "judge_time" timestamp(6),
+                                              "judger" varchar(150) COLLATE "pg_catalog"."default",
+                                              "judge_status" int2 DEFAULT 0,
+                                              "judge_progress" int2 DEFAULT 0,
+                                              "judge_checker" varchar(120) COLLATE "pg_catalog"."default",
+                                              "judge_checker_id" int8,
+                                              "judge_check_time" timestamp(6),
+                                              "appearance_result" varchar(150) COLLATE "pg_catalog"."default",
+                                              "contract_code" varchar(150) COLLATE "pg_catalog"."default",
+                                              "contract_sample_id" int8,
+                                              "sample_from" varchar(255) COLLATE "pg_catalog"."default",
+                                              "product_code" varchar(150) COLLATE "pg_catalog"."default",
+                                              "product_basis_name" varchar(150) COLLATE "pg_catalog"."default",
+                                              "compose_judge" int2 DEFAULT 0,
+                                              "product_standard_id" int8,
+                                              "name_code" varchar(100) COLLATE "pg_catalog"."default",
+                                              "surplus_sample_limit" timestamp(6),
+                                              "supplier" varchar(64) COLLATE "pg_catalog"."default",
+                                              "slot_no" varchar(32) COLLATE "pg_catalog"."default",
+                                              "code_type" int2,
+                                              "first_code" varchar(255) COLLATE "pg_catalog"."default",
+                                              "second_code" varchar(255) COLLATE "pg_catalog"."default",
+                                              "third_code" varchar(255) COLLATE "pg_catalog"."default",
+                                              "manufacturer" varchar(255) COLLATE "pg_catalog"."default",
+                                              "category" varchar(64) COLLATE "pg_catalog"."default",
+                                              "electrolyzer_id" int8,
+                                              "type" int2 DEFAULT 0,
+                                              "order_by" int2 DEFAULT 0,
+                                              "compliance_test" int2,
+                                              "fee" numeric(10,2) DEFAULT 0.00,
+                                              "modified" int2 DEFAULT 0,
+                                              "material_id" int8,
+                                              "code_edit" bool,
+                                              "retake" varchar(32) COLLATE "pg_catalog"."default"
+)
+;
+COMMENT ON COLUMN "public"."contract_sampling"."id" IS '主键';
+COMMENT ON COLUMN "public"."contract_sampling"."name" IS '样品名称';
+COMMENT ON COLUMN "public"."contract_sampling"."company_id" IS '企业ID';
+COMMENT ON COLUMN "public"."contract_sampling"."uid" IS '创建人ID';
+COMMENT ON COLUMN "public"."contract_sampling"."ctime" IS '创建时间';
+COMMENT ON COLUMN "public"."contract_sampling"."ltime" IS '最后修改时间';
+COMMENT ON COLUMN "public"."contract_sampling"."lid" IS '最后修改人ID';
+COMMENT ON COLUMN "public"."contract_sampling"."deleted" IS '是否删除0否1是';
+COMMENT ON COLUMN "public"."contract_sampling"."entrust_id" IS '委托ID';
+COMMENT ON COLUMN "public"."contract_sampling"."code" IS '样品编号';
+COMMENT ON COLUMN "public"."contract_sampling"."sample_shape" IS '样品状态';
+COMMENT ON COLUMN "public"."contract_sampling"."sample_quantity" IS '样品数量';
+COMMENT ON COLUMN "public"."contract_sampling"."standard" IS '执行标准';
+COMMENT ON COLUMN "public"."contract_sampling"."status" IS '状态';
+COMMENT ON COLUMN "public"."contract_sampling"."progress" IS '进度';
+COMMENT ON COLUMN "public"."contract_sampling"."receiver" IS '样品接收人';
+COMMENT ON COLUMN "public"."contract_sampling"."receiver_id" IS '样品接收人ID';
+COMMENT ON COLUMN "public"."contract_sampling"."receive_time" IS '样品接收时间';
+COMMENT ON COLUMN "public"."contract_sampling"."sample_grading" IS '样品判级';
+COMMENT ON COLUMN "public"."contract_sampling"."quality_registration" IS '质量登记';
+COMMENT ON COLUMN "public"."contract_sampling"."ok_judge" IS '合格品判定';
+COMMENT ON COLUMN "public"."contract_sampling"."judger_id" IS '判定人ID';
+COMMENT ON COLUMN "public"."contract_sampling"."judge_time" IS '判定时间';
+COMMENT ON COLUMN "public"."contract_sampling"."judger" IS '判定人';
+COMMENT ON COLUMN "public"."contract_sampling"."judge_status" IS '判定状态0待登记1审核中2审核通过';
+COMMENT ON COLUMN "public"."contract_sampling"."judge_progress" IS '判定进度0待登记1审核中2审核通过-1审核退回';
+COMMENT ON COLUMN "public"."contract_sampling"."judge_checker" IS '判定审核人';
+COMMENT ON COLUMN "public"."contract_sampling"."judge_checker_id" IS '判定审核人ID';
+COMMENT ON COLUMN "public"."contract_sampling"."judge_check_time" IS '判定审核时间';
+COMMENT ON COLUMN "public"."contract_sampling"."appearance_result" IS '外观检测结果';
+COMMENT ON COLUMN "public"."contract_sampling"."contract_code" IS '合同编号';
+COMMENT ON COLUMN "public"."contract_sampling"."contract_sample_id" IS '合同样品ID';
+COMMENT ON COLUMN "public"."contract_sampling"."sample_from" IS '样品来源';
+COMMENT ON COLUMN "public"."contract_sampling"."product_code" IS '产品标准';
+COMMENT ON COLUMN "public"."contract_sampling"."product_basis_name" IS '产品标准名称';
+COMMENT ON COLUMN "public"."contract_sampling"."compose_judge" IS '组合判定';
+COMMENT ON COLUMN "public"."contract_sampling"."product_standard_id" IS '产品标准ID';
+COMMENT ON COLUMN "public"."contract_sampling"."name_code" IS '物资编码';
+COMMENT ON COLUMN "public"."contract_sampling"."surplus_sample_limit" IS '余样保存期限';
+COMMENT ON COLUMN "public"."contract_sampling"."supplier" IS '供货单位';
+COMMENT ON COLUMN "public"."contract_sampling"."slot_no" IS '槽号';
+COMMENT ON COLUMN "public"."contract_sampling"."manufacturer" IS '制造厂商';
+COMMENT ON COLUMN "public"."contract_sampling"."category" IS '样品类型';
+COMMENT ON COLUMN "public"."contract_sampling"."electrolyzer_id" IS '电解质ID';
+COMMENT ON COLUMN "public"."contract_sampling"."type" IS '样品类别（0，正常 1标样）';
+COMMENT ON COLUMN "public"."contract_sampling"."order_by" IS '排序';
+COMMENT ON COLUMN "public"."contract_sampling"."compliance_test" IS '符合性检测【0：否，1：是】';
+COMMENT ON COLUMN "public"."contract_sampling"."fee" IS '检测费';
+COMMENT ON COLUMN "public"."contract_sampling"."modified" IS '是否被更改【0-未修改，1-被修改】';
+COMMENT ON COLUMN "public"."contract_sampling"."material_id" IS '物资ID';
+COMMENT ON COLUMN "public"."contract_sampling"."code_edit" IS '是否可编辑';
+COMMENT ON COLUMN "public"."contract_sampling"."retake" IS '原铝是否重取';
+COMMENT ON TABLE "public"."contract_sampling" IS '合同采样表';
+
+-- ----------------------------
+-- Primary Key structure for table contract_sampling
+-- ----------------------------
+ALTER TABLE "public"."contract_sampling" ADD CONSTRAINT "entrust_sampling_pkey" PRIMARY KEY ("id");
+
+-- --
+-- --
+ALTER TABLE "public"."entrust_sample_backup"
+    ADD COLUMN "contract_id" int8,
+    ADD COLUMN "sampling_id" int8;
+
+COMMENT ON COLUMN "public"."entrust_sample_backup"."contract_id" IS '储运合同id';
+COMMENT ON COLUMN "public"."entrust_sample_backup"."sampling_id" IS '储运合同样品id';
\ No newline at end of file