校验无项目问题

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

@@ -61,6 +61,18 @@ public class EntrustSampleController extends ServiceController {
         return success(entrustSampleService.page(getPage(), entrustSample));
     }
 
+    @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_of_entrust")
+    public RestResult<Page<EntrustSample>> pageOfEntrust(EntrustSample entrustSample) {
+        return success(entrustSampleService.page(getPage(), entrustSample));
+    }
+
     @ApiOperation("获取样品列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

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

@@ -1766,6 +1766,14 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         } else {
             editEntrust(entrustDTO, true, account);
         }
+        //提交至下一个流程前先进性校验项目是否存在
+        List<EntrustSample> sampleList = entrustSampleService.list(Condition.create().eq("entrust_id", entrustDTO.getId()));
+        RestAssert.fail(CollectionUtils.isEmpty(sampleList), "样品信息不能为空！");
+        for (EntrustSample sample : sampleList) {
+            List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("entrust_sample_id", sample.getId()));
+            RestAssert.fail(CollectionUtils.isEmpty(itemList), "该样品下项目为空!请重新确认后再提交!样品名称" + sample.getName() + ";槽号:" + sample.getSlotNo());
+        }
+        // 提交至下一个流程
         return submitToNextFlow(new Long[]{entrustDTO.getId()}, account);
     }