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