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; }