From 62619cff80b86bbb6fed6770c5d1d2213190bdf3 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Thu, 20 Feb 2025 17:06:00 +0800 Subject: [PATCH] =?UTF-8?q?20250220=20=E6=9B=B4=E6=96=B0=201.=E9=80=81?= =?UTF-8?q?=E6=A3=80=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E5=A7=94=E6=89=98?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E5=A7=94?= =?UTF-8?q?=E6=89=98=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=89=B4=E5=AE=9A=E6=83=85=E5=86=B5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=202.=E5=A4=84=E7=90=86=E5=B7=B2=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=9A=84=E5=A7=94=E6=89=98=E5=9C=A8=E6=AC=A1=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E7=94=A8=E6=9F=A5=E7=9C=8B=E6=A3=80?= =?UTF-8?q?=E6=9D=90=E6=8E=A5=E5=8F=A3=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=203.=E5=9B=9E=E6=98=BE=E9=89=B4?= =?UTF-8?q?=E5=AE=9A=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseEventController.java | 4 +-- .../dto/UpdateCaseAndEntrustTypeDTO.java | 10 +++--- .../entrustment/entity/Entrustment.java | 2 +- ...mentIdentificationMaterialServiceImpl.java | 14 +++++--- .../platform/entrustment/vo/CaseEventVO.java | 10 +++--- .../entrustment/vo/EntrustAlterApplyVO.java | 5 +++ src/main/resources/mapper/CaseEventMapper.xml | 34 +++++++++++-------- .../mapper/EntrustAlterApplyMapper.xml | 3 +- 8 files changed, 47 insertions(+), 35 deletions(-) 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 9555649..57ea8e1 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java @@ -96,7 +96,7 @@ public class CaseEventController { Entrustment one = entrustmentService.getOne(Wrappers.lambdaQuery().eq(Entrustment::getCaseId, id)); cevo.setEntrustmentType(one.getEntrustmentType()); -// cevo.setType(one.getType()); + cevo.setOldIdentificationResult(one.getOldIdentificationResult()); return R.ok(cevo); } @@ -242,7 +242,7 @@ public class CaseEventController { entrustmentService.update(Wrappers.lambdaUpdate() .eq(Entrustment::getId, dto.getEntrustId()) .set(Entrustment::getEntrustmentType, dto.getEntrustmentType()) -// .set(StrUtil.isNotBlank(dto.getType()), Entrustment::getType, dto.getType()) + .set(StrUtil.isNotBlank(dto.getOldIdentificationResult()), Entrustment::getOldIdentificationResult, dto.getOldIdentificationResult()) ); } return R.ok(caseEvent, "保存案件信息成功"); diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java index 1bb785e..7098c4f 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/UpdateCaseAndEntrustTypeDTO.java @@ -97,10 +97,8 @@ public class UpdateCaseAndEntrustTypeDTO { @ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本") private Integer entrustmentType; - /** - * 20250121 新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分 - * 存字符串，不用code表达 - */ - @ApiModelProperty("新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分") - private String type; + @ApiModelProperty(value="原鉴定结果（鉴定情况），" + + "常规毒品：首次鉴定、初筛（不要报告、只要结果）、补充鉴定、重新鉴定；" + + "生物样本：首次鉴定、初筛（不要报告、只要结果）、涉缅人员、自愿戒治人员、补充鉴定、重新鉴定") + private String oldIdentificationResult; } diff --git a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java index 016e6cc..40ca46e 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java +++ b/src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java @@ -214,7 +214,7 @@ public class Entrustment extends BaseEntity { /** * 原鉴定结果 */ - @ApiModelProperty(value="原鉴定结果，" + + @ApiModelProperty(value="原鉴定结果（鉴定情况），" + "常规毒品：首次鉴定、初筛（不要报告、只要结果）、补充鉴定、重新鉴定；" + "生物样本：首次鉴定、初筛（不要报告、只要结果）、涉缅人员、自愿戒治人员、补充鉴定、重新鉴定") private String oldIdentificationResult; diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java index 9951471..c51cec2 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentIdentificationMaterialServiceImpl.java @@ -517,6 +517,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl= 0) { + return null; + } + if (entrustment.getStatus() != EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_CHECK.getStatus()) { throw new RuntimeException("委托不在待审核状态"); } @@ -780,10 +785,11 @@ public class EntrustmentIdentificationMaterialServiceImpl extends ServiceImpl diff --git a/src/main/resources/mapper/EntrustAlterApplyMapper.xml b/src/main/resources/mapper/EntrustAlterApplyMapper.xml index fa806d0..2108dae 100644 --- a/src/main/resources/mapper/EntrustAlterApplyMapper.xml +++ b/src/main/resources/mapper/EntrustAlterApplyMapper.xml @@ -35,7 +35,8 @@ eaa.*, ce.case_name, ce.id as case_id, - e.entrustment_type + e.entrustment_type, + e.old_identification_result FROM b_entrust_alter_apply eaa LEFT JOIN b_entrustment e ON eaa.entrust_id = e.id