From 30a090da05b26c6f08b997346bcc5700e093a5ec Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Fri, 22 Nov 2024 09:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E6=97=B6=E8=BF=94=E5=9B=9E=E5=A7=94=E6=89=98?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/entrustment/controller/CaseEventController.java | 3 ++- .../laboratory/platform/entrustment/vo/CaseEventVO.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java index d3d82ac..12017fd 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java @@ -88,7 +88,8 @@ public class CaseEventController { System.out.println(String.format("getById forEdit=%s getAncestorids=", forEdit, rOrg)); } -// cevo.setCaseOwnOrgAncestors(); + Entrustment one = entrustmentService.getOne(Wrappers.lambdaQuery().eq(Entrustment::getCaseId, id)); + cevo.setEntrustmentType(one.getEntrustmentType()); return R.ok(cevo); } diff --git a/src/main/java/digital/laboratory/platform/entrustment/vo/CaseEventVO.java b/src/main/java/digital/laboratory/platform/entrustment/vo/CaseEventVO.java index a256195..3f59d83 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/vo/CaseEventVO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/vo/CaseEventVO.java @@ -24,4 +24,7 @@ public class CaseEventVO extends CaseEvent { int caseEntrustmentCount; int caseEvidenceCount; List caseEvidenceList; + + @ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本") + private Integer entrustmentType; }