委托进度查询报表：查询条件：委托人、样品名称不可用

数据录入，选择原始记录模板后，报“参数有误”
原铝品位统计表：1、缺数据；2、后面的“台次占比”不是百分数；3、“台次占比”百分数改成保留2位小数
原铝判级结果不对
修改合同登记：查询条件：订单号、物资编码改为模糊搜索
修改验收任务登记  菜单打开时报500错误
修改验收结果录入：样品的检测项目为空
修改验收结果录入 检测类型为“内部检测”“外委检测”的，提交时增加闸口判定：检测结果不能为空
修改储运入库登记：增加功能按钮“入库登记”
修改储运入库登记：增加“入库数量”“入库时间”“保管员”
修改检测结果查询：搜索条件“样品名称”为精准查找
修改报告编制：是否重取逻辑执行有问题，应该重取的没判定出来

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

@@ -93,7 +93,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_store_transport")
     public RestResult<Page<ContractSampleVO>> getPageStoreTransport(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.STORE_TRANSPORT);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "储运分厂一二期", "储运分厂三期"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "储运分厂一二期", "储运分厂三期"));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -115,7 +115,7 @@ public class ContractSampleController extends ServiceController {
         statusList.add(ContractSampleStatusEnum.OUT_DRIFT);
         statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
         contractSample.setStatusList(statusList);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "储运分厂一二期", "储运分厂三期"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "储运分厂一二期", "储运分厂三期"));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -142,7 +142,7 @@ public class ContractSampleController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page_out_reg")
-    public RestResult<Page<ContractSample>> getPageOutReg(ContractSample contractSample) {
+    public RestResult<Page<ContractSampleVO>> getPageOutReg(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
         return success(contractSampleService.pageOutReg(getPage(), contractSample));
     }
@@ -187,9 +187,9 @@ public class ContractSampleController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page_entrust_reg")
-    public RestResult<Page<ContractSample>> getPageEntrustReg(ContractSample contractSample) {
+    public RestResult<Page<ContractSampleVO>> getPageEntrustReg(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期质量室", "三期质量室"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期质量室", "三期质量室"));
         return success(contractSampleService.pageOutReg(getPage(), contractSample));
     }
 
@@ -242,8 +242,8 @@ public class ContractSampleController extends ServiceController {
                 ContractSampleStatusEnum.OUT_DRIFT,
                 ContractSampleStatusEnum.ENTRUST_REG
         ));
-        contractSample.setNeType(0);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(),"二期验收室","三期验收室"));
+        contractSample.setType(2);
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(),"二期验收室","三期验收室"));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -276,7 +276,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_check_accept_org")
     public RestResult<Page<ContractSampleVO>> getPageCheckAcceptOrg(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -291,7 +291,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_check_accept_org_his")
     public RestResult<Page<ContractSampleVO>> getPageCheckAcceptOrgHis(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
         return success(contractSampleService.pageCheckAcceptOrgHis(getPage(), contractSample));
     }
 
@@ -334,7 +334,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_check_result_input")
     public RestResult<Page<ContractSampleVO>> getPageCheckResultInput(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.CHECK_RESULT_INPUT);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -348,7 +348,7 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_storage_register")
     public RestResult<Page<ContractSampleVO>> getPageStorageRegister(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.STORAGE_REGISTER);
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -368,7 +368,7 @@ public class ContractSampleController extends ServiceController {
                 ContractSampleStatusEnum.ENTRUST_REG,
                 ContractSampleStatusEnum.ACCEPTANCE_CHECK_PUBLISH
         ));
-        contractSample.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
+        contractSample.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(), "二期验收室", "三期验收室"));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -409,10 +409,6 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/")
     public RestResult<Boolean> add(ContractSample contractSample) {
         contractSample.setPeriod(userInfoService.getUserPeriod(getAccount()));
-        List<String> orgNameList = userInfoService.getUserOrgNames(getAccount());
-        if (CollectionUtils.isNotEmpty(orgNameList)) {
-            contractSample.setUserOrgNames(StringUtils.join(orgNameList, ","));
-        }
         return success(contractSampleService.save(contractSample));
     }
 
@@ -421,10 +417,6 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/add_contract_sample")
     public RestResult<Boolean> addDTO(@RequestBody ContractSampleDTO dto) {
         dto.setPeriod(userInfoService.getUserPeriod(getAccount()));
-        List<String> orgNameList = userInfoService.getUserOrgNames(getAccount());
-        if (CollectionUtils.isNotEmpty(orgNameList)) {
-            dto.setUserOrgNames(StringUtils.join(orgNameList, ","));
-        }
         return success(contractSampleService.addDTO(dto));
     }
 

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

@@ -61,10 +61,10 @@ public class EntrustController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
     })
     @PostMapping("/page_out")
-    public RestResult<Page<Entrust>> getPageOut(Entrust entrust) {
+    public RestResult<Page<EntrustVO>> getPageOut(EntrustVO entrust) {
         entrust.setStatus(EntrustStatusEnum.OUT_DRAFT);
-        entrust.setUserOrgNames(userInfoService.getOrgNameByUserPeriod(getAccount(),"二期验收室","三期验收室"));
-        return success(entrustService.page(getPage(), entrust));
+        entrust.setUserOrgName(userInfoService.getOrgNameByUserPeriod(getAccount(),"二期验收室","三期验收室"));
+        return success(entrustService.pageVO(getPage(), entrust));
     }
 
 

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

@@ -71,7 +71,7 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
 
     boolean addJudgementType(Long[] ids, String judgement, Account account);
 
-    Page<ContractSample> pageOutReg(Page<ContractSample> page, ContractSample contractSample);
+    Page<ContractSampleVO> pageOutReg(Page<ContractSampleVO> page, ContractSampleVO contractSample);
 
     boolean isOutEntrustData(Long contractSampleId);
 

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

@@ -117,4 +117,6 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
     boolean updateQualityJudgeFlow(Long[] ids, Account account);
 
     boolean updateSampleRetakeByEntrustId(Long entrustId);
+
+    List<EntrustSampleItemVO> getSampleItemIndexList(Long sampleId);
 }

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

@@ -118,4 +118,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     Page<EntrustSampleVO> pageAcceptanceResultEntry(Page<EntrustSampleVO> page, EntrustSampleVO entrustSampleVO);
 
     String getNewCode(String queryKey, int lens);
+
+    EntrustSample getByContractId(Long contractId);
 }

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

@@ -10,19 +10,16 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
 import com.patzn.cloud.service.hmhj.dto.ContractSampleVODTO;
-import com.patzn.cloud.service.hmhj.entity.ContractSample;
-import com.patzn.cloud.service.hmhj.entity.ContractSampleItem;
-import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
-import com.patzn.cloud.service.hmhj.entity.EntrustSample;
+import com.patzn.cloud.service.hmhj.entity.*;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
+import com.patzn.cloud.service.lims.common.consts.Symbol;
 import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
+import com.patzn.cloud.service.lims.hmhj.common.consts.HmConst;
 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.service.lims.hmhj.service.IEntrustSampleService;
+import com.patzn.cloud.service.lims.hmhj.service.*;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -66,6 +63,9 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     private IContractSampleItemService contractSampleItemService;
 
     @Autowired
+    private IEntrustSampleItemService entrustSampleItemService;
+
+    @Autowired
     private ILmsMsgService lmsMsgService;
 
     @Override
@@ -128,6 +128,7 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     public boolean submitToStoreRegister(Long[] ids, Account account) {
         RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的合同！");
         judgePauseStatus(ids);
+        judgeItemFillStatus(ids);
         ContractSample contractSample = new ContractSample();
         contractSample.setStatus(ContractSampleStatusEnum.STORAGE_REGISTER);
         contractSample.setProgress(ContractSampleStatusEnum.STORAGE_REGISTER);
@@ -136,6 +137,25 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return super.update(contractSample, Condition.create().in("id", ids));
     }
 
+    private void judgeItemFillStatus(Long[] ids) {
+        List<ContractSample> contractSamples = getBatchIds(Arrays.asList(ids));
+        List<EntrustSampleItemVO> sampleItemList;
+        for (ContractSample cs : contractSamples) {
+            boolean isOutEntrustData = null != cs.getType() && 1 == cs.getType().intValue() ? true : false;
+            EntrustSample sample = entrustSampleService.getByContractId(cs.getId());
+            if (null == sample) {
+                continue;
+            }
+            // 若为外部检测
+            if (isOutEntrustData) {
+                sampleItemList = entrustSampleItemService.getListBySampleId(sample.getId());
+                RestAssert.fail(CollectionUtils.isNotEmpty(sampleItemList) &&
+                                sampleItemList.stream().anyMatch(t -> StringUtils.isBlank(t.getTestValue())),
+                        String.format("编号为【%s】样品，存在检测结果为空的项目", sample.getCode()));
+            }
+        }
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -446,24 +466,9 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     }
 
     @Override
-    public Page<ContractSample> pageOutReg(Page<ContractSample> page, ContractSample contractSample) {
-        String code = contractSample.getCode(),userOrgNames = contractSample.getUserOrgNames();
-        String materialName = contractSample.getMaterialName();
-        contractSample.setCode(null).setMaterialName(null).setUserOrgNames(null);
-        Wrapper wrapper = new EntityWrapper<>(contractSample);
-
-        if (StringUtils.isNotBlank(code)) {
-            wrapper.like("code", code);
-        }
-        if (StringUtils.isNotBlank(materialName)) {
-            wrapper.like("material_name", materialName);
-        }
-        if (StringUtils.isNotBlank(userOrgNames)) {
-            wrapper.like("user_org_names", userOrgNames);
-        }
-        wrapper.orderBy("ctime", false);
-        wrapper.notExists("select 1 from entrust_sample s where s.deleted = 0  and s.contract_sample_id = contract_sample.id");
-        return this.page(page, wrapper);
+    public Page<ContractSampleVO> pageOutReg(Page<ContractSampleVO> page, ContractSampleVO contractSample) {
+        contractSample.setNoShowSample(HmConst.Y);
+        return page.setRecords(baseMapper.selectVOList(page,contractSample));
     }
 
     @Override

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

@@ -370,23 +370,29 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         // 提交到下一节点，可能是不更改状态
         if (entrustService.isCanIntoNextNode(entrust)) {
             entrustService.submitToNextNode(entrust, account);
+            // 提交后执行组合判定
+            entrustSampleItemService.updateItemComposeJudgeByEntrustId(entrustId);
+            updateComposeJudgeByTestValue(entrustId);
+            // 执行转PDF操作
+            executor1.execute(() -> changeExcelToPdf(ids, list));
+            // 处理原铝是否重取
+            executor1.execute(() -> updateSampleRetakeByEntrustId(entrustId));
             return true;
         }
         // 修改委托信息
         entrust.setLid(account.getUserId()).setLtime(new Date()).setFlowStatus(EntrustFlowEnum.REPORT_MAKE.getName()).setProgress(EntrustStatusEnum.TEST).setStatus(EntrustStatusEnum.TEST);
         entrustService.updateById(entrust);
+
+        // 提交后执行组合判定
+        entrustSampleItemService.updateItemComposeJudgeByEntrustId(entrustId);
+        updateComposeJudgeByTestValue(entrustId);
+
         // 添加委托日志
         entrustRecordService.record(new Long[]{entrustId}, "数据录入", "报告编制", 0, account, "提交至报告编制");
 
         // 执行转PDF操作
         executor1.execute(() -> changeExcelToPdf(ids, list));
 
-        // 提交后执行组合判定
-        executor1.execute(() -> {
-            entrustSampleItemService.updateItemComposeJudgeByEntrustId(entrust.getId());
-            updateComposeJudgeByTestValue(entrustId);
-        });
-
         // 处理原铝是否重取
         executor1.execute(() -> updateSampleRetakeByEntrustId(entrustId));
         return true;
@@ -988,7 +994,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
                 sampleItemList = entrustSampleItemService.getListBySampleId(sampleVO.getId());
             } else {
                 // 获取检测项目及指标数据
-                sampleItemList = baseMapper.listIndexReplaceItemBySampleId(sampleVO.getId());
+                sampleItemList = getSampleItemIndexList(sampleVO.getId());
             }
 
             RestAssert.fail(CollectionUtils.isEmpty(sampleItemList), "样品检测项目及内容不能为空");
@@ -1121,6 +1127,14 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         return true;
     }
 
+    @Override
+    public List<EntrustSampleItemVO> getSampleItemIndexList(Long sampleId) {
+        if (null == sampleId) {
+            return null;
+        }
+        return baseMapper.listIndexReplaceItemBySampleId(sampleId);
+    }
+
     private String getCellValue(XSSFRow xssfRow, int cellIndex) {
         XSSFCell cell = xssfRow.getCell(cellIndex);
         String value = HSSFWorkbookUtil.getJavaValue(cell).toString();

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

@@ -1898,15 +1898,16 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     @Override
     public Page<EntrustSampleVO> pageAcceptanceResultEntry(Page<EntrustSampleVO> page, EntrustSampleVO entrustSampleVO) {
         if (null == entrustSampleVO.getContractSampleId()) {
-            return null;
+            return page.setRecords(null);
         }
         List<EntrustSample> entrustSamples = list(Condition.create().eq("contract_sample_id", entrustSampleVO.getContractSampleId()));
+
         if (CollectionUtils.isEmpty(entrustSamples)) {
-            return null;
+            return page.setRecords(null);
         }
         Long entrustId = entrustSamples.get(0).getEntrustId();
         if (null == entrustId) {
-            return null;
+            return page.setRecords(null);
         }
         entrustSampleVO.setEntrustId(entrustId);
         return page.setRecords(baseMapper.selectVOList(page, entrustSampleVO));
@@ -1931,4 +1932,13 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
             throw new PatznException("样品编码流水号获取异常");
         }
     }
+
+    @Override
+    public EntrustSample getByContractId(Long contractId) {
+        if (null == contractId) {
+            return null;
+        }
+        List<EntrustSample> sampleList = list(Condition.create().eq("contract_sample_id", contractId));
+        return CollectionUtils.isEmpty(sampleList) ? null : sampleList.get(0);
+    }
 }
\ No newline at end of file

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

@@ -113,8 +113,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
     @Override
     public Page<Entrust> page(Page<Entrust> page, Entrust entrust) {
-        String code = entrust.getCode(), client = entrust.getClient(),userOrgNames = entrust.getUserOrgNames();
-        entrust.setCode(null).setClient(null).setUserOrgNames(null);
+        String code = entrust.getCode(), client = entrust.getClient();
+        entrust.setCode(null).setClient(null);
         Wrapper wrapper = new EntityWrapper<>(entrust);
         if (StringUtils.isNotBlank(code)) {
             wrapper.like("code", code);
@@ -122,9 +122,6 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         if (StringUtils.isNotBlank(client)) {
             wrapper.like("client", client);
         }
-        if (StringUtils.isNotBlank(userOrgNames)) {
-            wrapper.like("user_org_names", userOrgNames);
-        }
         wrapper.orderBy("ctime", false);
         return this.page(page, wrapper);
     }
@@ -338,9 +335,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         // 保存并提交委托时使用
         dto.setId(entrust.getId());
         List<String> orgNameList = userInfoService.getUserOrgNames(account);
-        if (com.baomidou.mybatisplus.toolkit.CollectionUtils.isNotEmpty(orgNameList)) {
-            dto.setUserOrgNames(StringUtils.join(orgNameList, ","));
-        }
+
         if (CollectionUtils.isNotEmpty(sampleDTOList)) {
             RestAssert.fail(sampleDTOList.stream().map(EntrustSampleDTO::getName).distinct().count() > 1, "一个委托只能下同一种样品!");
 

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

@@ -189,7 +189,7 @@ public class UserInfoServiceImpl {
     }
 
     public List<String> getUserOrgNames(Account account) {
-        List<SysOrg> orgList = sysOrgClient.getListByUserId(account.getUserId()).getData();
+        List<SysOrg> orgList = sysOrgClient.getListRecursiveByUserId(account.getUserId()).getData();
         if (CollectionUtils.isEmpty(orgList)) {
             return null;
         }
@@ -205,7 +205,7 @@ public class UserInfoServiceImpl {
     }
 
     public String getUserPeriod(Account account) {
-        List<SysOrg> orgList = sysOrgClient.getListByUserId(account.getUserId()).getData();
+        List<SysOrg> orgList = sysOrgClient.getListRecursiveByUserId(account.getUserId()).getData();
         if (CollectionUtils.isEmpty(orgList)) {
             return null;
         }

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

@@ -9,6 +9,10 @@
             AND s.type != #{vo.neType}
         </if>
 
+        <if test="null!=vo.type">
+            AND s.type = #{vo.type}
+        </if>
+
         <if test="null!=vo.status">
             AND s.status = #{vo.status}
         </if>
@@ -17,16 +21,24 @@
             AND s.code LIKE CONCAT('%',#{vo.code},'%')
         </if>
 
+        <if test="null!=vo.orderNo">
+            AND s.order_no LIKE CONCAT('%',#{vo.orderNo},'%')
+        </if>
+
         <if test="null!=vo.materialName">
             AND s.material_name LIKE CONCAT('%',#{vo.materialName},'%')
         </if>
 
+        <if test="null!=vo.materialCode">
+            AND s.material_code LIKE CONCAT('%',#{vo.materialCode},'%')
+        </if>
+
         <if test="null!=vo.currUserId">
             AND exists (select 1 from v_sys_user_role r where r.user_id = #{vo.currUserId} and r.role_name in ('验收主管','验收管理员'))
         </if>
 
-        <if test="null!=vo.userOrgNames">
-            AND s.user_org_names LIKE CONCAT('%',#{vo.userOrgNames},'%')
+        <if test="null!=vo.userOrgName">
+            AND strpos(#{vo.userOrgName},s.factory_area) > 0
         </if>
 
         <if test="null!=vo.statusList">
@@ -42,6 +54,12 @@
                 #{id}
             </foreach>
         </if>
+
+        <if test="null != vo.noShowSample">
+            AND NOT EXISTS (
+                select 1 from entrust_sample ss where ss.deleted = 0 and ss.contract_sample_id = s.id
+            )
+        </if>
     </sql>
 
     <sql id="orderBy">

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

@@ -22,6 +22,12 @@
         <if test="null!=vo.flowStatus">
             AND e.flow_status = #{vo.flowStatus}
         </if>
+        <if test="null!=vo.sampleName">
+            AND e.sample_name like concat('%',#{vo.sampleName},'%')
+        </if>
+        <if test="null!=vo.assignor">
+            AND e.assignor like concat('%',#{vo.assignor},'%')
+        </if>
         <if test="null != vo.isSelf and true == vo.isSelf">
             AND (
                 e.uid = #{vo.uid} or
@@ -143,8 +149,14 @@
         WHERE e.deleted = 0
         <include refid="basicCondition"/>
 
-        <if test="null != vo.sampleName">
-            AND e.sample_name like concat('%',#{vo.sampleName},'%')
+        <if test="null != vo.userOrgName">
+            AND exists (
+                select 1
+                from entrust_sample es
+                join contract_sample cs on es.contract_sample_id = cs.id
+                where es.deleted = 0 and cs.deleted = 0
+                and strpos(#{vo.userOrgName},cs.factory_area) > 0
+            )
         </if>
 
         <if test="null != vo.itemStatus">

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

@@ -144,8 +144,8 @@
         ) cr on cr.sample_id = s.id
         WHERE
             s.deleted = 0 AND s.type = 0 AND e.deleted = 0
-        <if test="vo.name!=null">
-            AND s.name LIKE CONCAT('%',#{vo.name},'%')
+        <if test="vo.name != null">
+            AND s.name = #{vo.name}
         </if>
         <if test="vo.entrustTimeStart!=null">
             AND e.entrust_time >= #{vo.entrustTimeStart}
@@ -202,23 +202,23 @@
             ( CASE WHEN COUNT ( 1 ) / ${vo.days} > 1 THEN ( COUNT ( 1 ) / (${vo.days} / 2) ) ELSE 1 END ) "slots_num",
 
             sum(ix.al_85_num) "al_85_num",
-            round(coalesce(sum(ix.al_85_num),0) * 1.0 / COUNT ( 1 ),2) "al_85_per",
+            round(coalesce(sum(ix.al_85_num),0) * 1.0 / COUNT ( 1 ),4) "al_85_per",
             round(coalesce(sum(ix.al_85_num),0) / (${vo.days} / 2)) "al_85_slots_num",
 
             sum(ix.al_80_num) "al_80_num",
-            round(coalesce(sum(ix.al_80_num),0) * 1.0 / COUNT ( 1 ),2) "al_80_per",
+            round(coalesce(sum(ix.al_80_num),0) * 1.0 / COUNT ( 1 ),4) "al_80_per",
             round(coalesce(sum(ix.al_80_num),0) / (${vo.days} / 2)) "al_80_slots_num",
 
             sum(ix.al_70_num) "al_70_num",
-            round(coalesce(sum(ix.al_70_num),0) * 1.0 / COUNT ( 1 ),2) "al_70_per",
+            round(coalesce(sum(ix.al_70_num),0) * 1.0 / COUNT ( 1 ),4) "al_70_per",
             round(coalesce(sum(ix.al_70_num),0) / (${vo.days} / 2)) "al_70_slots_num",
 
             sum(ix.al_70_dt_num) "al_70_dt_num",
-            round(coalesce(sum(ix.al_70_dt_num),0) * 1.0 / COUNT ( 1 ),2) "al_70_dt_per",
+            round(coalesce(sum(ix.al_70_dt_num),0) * 1.0 / COUNT ( 1 ),4) "al_70_dt_per",
             round(coalesce(sum(ix.al_70_dt_num),0) / (${vo.days} / 2)) "al_70_dt_slots_num",
 
             sum(ix.al_70_ge_num) "al_70_ge_num",
-            round(coalesce(sum(ix.al_70_ge_num),0) * 1.0 / COUNT ( 1 ),2) "al_70_ge_per",
+            round(coalesce(sum(ix.al_70_ge_num),0) * 1.0 / COUNT ( 1 ),4) "al_70_ge_per",
             round(coalesce(sum(ix.al_70_ge_num),0) / (${vo.days} / 2)) "al_70_ge_slots_num"
         FROM
             entrust_sample s

src/test/java/resources/db_sql/hmhj/v158/20210824添加合同字段.sql

+/** created by meazty on 2021/8/20 17:07 **/
+/** created by meazty on 2021/8/20 17:07 **/
+ALTER TABLE "public"."contract_sample"
+    ADD COLUMN "storage_quantity" int4;
+
+COMMENT ON COLUMN "public"."contract_sample"."storage_quantity" IS '入库数量';
+