|
@@ -282,14 +282,13 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
|
|
|
}
|
|
|
|
|
|
Assert.isTrue(StrConstant.YES.equals(vo.getAuditResult()), "审核结果错误");
|
|
|
-// if (GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(sampleInfo.getStatus())) {
|
|
|
-// Assert.isTrue(StrUtil.isNotBlank(vo.getApprovalNo()), "项目批准编号必填");
|
|
|
-// //检查批准编号的唯一性
|
|
|
-// long count = count(new LambdaQueryWrapper<>(SampleInfo.class)
|
|
|
-// .eq(SampleInfo::getApprovalNo, vo.getApprovalNo())
|
|
|
-// .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode()));
|
|
|
-// Assert.isTrue(count < 1, "项目批准编号已存在");
|
|
|
-// }
|
|
|
+ if (StrUtil.isNotBlank(vo.getApprovalNo())) {
|
|
|
+ //检查批准编号的唯一性
|
|
|
+ long count = count(new LambdaQueryWrapper<>(SampleInfo.class)
|
|
|
+ .eq(SampleInfo::getApprovalNo, vo.getApprovalNo())
|
|
|
+ .eq(SampleInfo::getDeleted, WhetherEnum.NO.getCode()));
|
|
|
+ Assert.isTrue(count < 1, "项目批准编号已存在");
|
|
|
+ }
|
|
|
|
|
|
//审核通过
|
|
|
log.info("流程项目 ({}) 审核通过", sampleInfo.getProjectName());
|