diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java index d537975..763cf22 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustmentController.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import digital.laboratory.platform.common.core.constant.OSSDirectoryConstants; +import digital.laboratory.platform.common.core.exception.CheckedException; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.log.annotation.SysLog; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; @@ -1342,7 +1343,11 @@ public class EntrustmentController { // System.out.println(String.format("theHttpServletRequest.toString()=%s", theHttpServletRequest.toString())); Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); - return R.ok(entrustmentService.bizSubmitter_Apply(entrust, dlpUser), "委托提交成功"); + try { + return R.ok(entrustmentService.bizSubmitter_Apply(entrust, dlpUser), "委托提交成功"); + } catch (CheckedException e) { + return R.failed(e.getMessage()); + } } diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index 5923c4d..686bcfd 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -23,6 +23,7 @@ import com.deepoove.poi.data.Pictures; import com.deepoove.poi.plugin.table.MultipleRowTableRenderPolicy; import digital.laboratory.platform.common.core.constant.CommonConstants; import digital.laboratory.platform.common.core.constant.OSSDirectoryConstants; +import digital.laboratory.platform.common.core.exception.CheckedException; import digital.laboratory.platform.common.core.exception.ValidateCodeException; import digital.laboratory.platform.common.core.util.ClassUtils; import digital.laboratory.platform.common.core.util.R; @@ -497,7 +498,12 @@ public class EntrustmentServiceImpl extends ServiceImpl split = StrUtil.split(entrustment.getAcceptNo(), "-"); + dm.put("identificationNo", String.format("[%s]%s号", split.get(0), split.get(1)));//受理编号 + } +// dm.put("identificationNo", entrustment.getAcceptNo());//受理编号 dm.put("year", entrustment.getEntrustmentTime() != null ? entrustment.getEntrustmentTime().getYear() : LocalDate.now().getYear()); dm.put("materialDes", buildMaterialDes(materialList));//检材描述 @@ -1364,17 +1370,17 @@ public class EntrustmentServiceImpl extends ServiceImpl split = StrUtil.split(ev.getAcceptNo(), "-"); + dm.put("acceptNo", String.format("[%s]%s号", split.get(0), split.get(1))); + } String oldIdentificationResult = ev.getOldIdentificationResult(); String oldIdentification = ""; switch (oldIdentificationResult) {