Merge branch 'master' into dev

gradle/wrapper/gradle-wrapper.properties

+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-6.7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

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

 package com.patzn.cloud.service.lims.hmhj.controller;
+import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.api.RestConstants;
 import com.patzn.cloud.commons.api.RestResult;
@@ -262,6 +256,14 @@ public class ContractSampleController extends ServiceController {
 
 
 
+    @ApiOperation("添加")
+    @PostMapping("/add_contract_sample")
+    public RestResult<Boolean> addDTO(@RequestBody ContractSampleDTO dto) {
+        return success(contractSampleService.addDTO(dto));
+    }
+
+
+
     @ApiOperation("提交至储运登记")
     @PostMapping("/submit_to_store_transport")
     public RestResult<Boolean> submitToStoreTransport(@RequestParam("ids") Long [] ids) {

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

@@ -303,4 +303,19 @@ public class EntrustController extends ServiceController {
         return success(entrustService.pageEntrustJudge(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_check")
+    public RestResult<Page<EntrustVO>> getPageEntrustJudgeCheck(EntrustVO entrust) {
+        entrust.setSampleStatus(EntrustSampleStatusEnum.END);
+        entrust.setJudgeStatus(1);
+        return success(entrustService.pageEntrustJudge(getPage(), entrust));
+    }
+
 }

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

@@ -178,10 +178,39 @@ 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")
+    public RestResult<Page<EntrustSample>> getPageSampleMakeCheck(EntrustSample entrustSample) {
+        entrustSample.setStatus(EntrustSampleStatusEnum.END);
+        entrustSample.setJudgeStatus(1);
+        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()));
     }
 
+
+    @ApiOperation("质量审核通过")
+    @PostMapping("/submit_judge_check")
+    public RestResult<Boolean> submitJudgeCheck(@RequestParam("ids") Long [] ids) {
+        return success(entrustSampleService.submitJudgeCheck(ids,getAccount()));
+    }
+
+
+    @ApiOperation("质量审核驳回")
+    @PostMapping("/back_judge_check")
+    public RestResult<Boolean> backJudgeCheck(@RequestParam("ids") Long [] ids,@RequestParam("remark") String  remark) {
+        return success(entrustSampleService.backJudgeCheck(ids,remark,getAccount()));
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.patzn.cloud.service.lims.hmhj.service;
 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.ContractSampleDTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 
@@ -37,4 +38,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     boolean submitCheckResultInput(Long[] ids, Account account);
 
     Page<ContractSampleVO> pageVO(Page<ContractSampleVO> page, ContractSampleVO contractSample);
+
+    boolean addDTO(ContractSampleDTO dto);
 }

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

@@ -30,4 +30,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean makeReport(ReportDTO dto, Account account);
 
     boolean submitJudgeRegister(Long[] ids, Account account);
+
+    boolean submitJudgeCheck(Long[] ids, Account account);
+
+    boolean backJudgeCheck(Long[] ids, String remark, Account account);
 }

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

 package com.patzn.cloud.service.lims.hmhj.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
+import com.patzn.cloud.service.hmhj.entity.ContractSampleItem;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
 import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleMapper;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSampleItemService;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSampleService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
@@ -35,6 +39,10 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     @Autowired
     private IContractSampleRecordService contractSampleRecordService;
 
+
+    @Autowired
+    private IContractSampleItemService contractSampleItemService;
+
     @Autowired
     private ILmsMsgService lmsMsgService;
 
@@ -154,5 +162,21 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return page.setRecords(baseMapper.selectVOList(page,contractSample));
     }
 
+    @Override
+    public boolean addDTO(ContractSampleDTO dto) {
+        RestAssert.fail(null == dto , "数据有错误");
+        List<ContractSampleItem> itemList = dto.getItemList();
+        RestAssert.fail(CollectionUtils.isEmpty(itemList),"请选择检测项目");
+
+        ContractSample contractSample =   dto.convert(ContractSample.class);
+        if (save(contractSample)){
+            for (ContractSampleItem item:itemList) {
+                item.setContractSampleId(contractSample.getId());
+            }
+         return    contractSampleItemService.saveBatch(itemList);
+        }
+        return false;
+    }
+
 
 }

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

@@ -284,6 +284,32 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         return super.update(sample,Condition.create().in("id",ids));
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean submitJudgeCheck(Long[] ids, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的质量登记数据");
+        EntrustSample sample = new EntrustSample();
+        sample.setJudgeStatus(2);
+        sample.setJudgeProgress(2);
+        sample.setJudgeChecker(account.getUserName());
+        sample.setJudgeCheckerId(account.getUserId());
+        sample.setJudgeCheckTime(new Date());
+        return super.update(sample,Condition.create().in("id",ids));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean backJudgeCheck(Long[] ids, String remark, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择要提交的质量登记数据");
+        EntrustSample sample = new EntrustSample();
+        sample.setJudgeStatus(0);
+        sample.setJudgeProgress(-1);
+        sample.setJudgeChecker(account.getUserName());
+        sample.setJudgeCheckerId(account.getUserId());
+        sample.setJudgeCheckTime(new Date());
+        return super.update(sample,Condition.create().in("id",ids));
+    }
+
 
     public void reportMakeTestContent(XWPFTable xwpfTable, int length, int index, List<?> objList) {
         //检测内容