Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250219 更新

Browse Source 
删除了细分类型，添加了首次鉴定、初筛（不要报告、只要结果）、涉缅人员、自愿戒治人员、补充鉴定、重新鉴定
This commit is contained in:
陈江保
2025-02-19 17:40:44 +08:00
parent dd6d0b9f9c
commit 6fd8bc6c68
5 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/digital/laboratory/platform/entrustment/controller/CaseEventController.java
View File

@@ -96,7 +96,7 @@ public class CaseEventController {
Entrustment one = entrustmentService.getOne(Wrappers.<Entrustment>lambdaQuery().eq(Entrustment::getCaseId, id));
cevo.setEntrustmentType(one.getEntrustmentType());
cevo.setType(one.getType());
// cevo.setType(one.getType());
return R.ok(cevo);
}
@@ -242,7 +242,7 @@ public class CaseEventController {
entrustmentService.update(Wrappers.<Entrustment>lambdaUpdate()
.eq(Entrustment::getId, dto.getEntrustId())
.set(Entrustment::getEntrustmentType, dto.getEntrustmentType())
.set(StrUtil.isNotBlank(dto.getType()), Entrustment::getType, dto.getType())
// .set(StrUtil.isNotBlank(dto.getType()), Entrustment::getType, dto.getType())
);
}
return R.ok(caseEvent, "保存案件信息成功");

16
src/main/java/digital/laboratory/platform/entrustment/entity/Entrustment.java
View File

@@ -214,7 +214,9 @@ public class Entrustment extends BaseEntity {
/**
* 原鉴定结果
*/
@ApiModelProperty(value="原鉴定结果")
@ApiModelProperty(value="原鉴定结果，" +
"常规毒品：首次鉴定、初筛（不要报告、只要结果）、补充鉴定、重新鉴定；" +
"生物样本：首次鉴定、初筛（不要报告、只要结果）、涉缅人员、自愿戒治人员、补充鉴定、重新鉴定")
private String oldIdentificationResult;
/**
@@ -746,12 +748,12 @@ public class Entrustment extends BaseEntity {
@ApiModelProperty(value="是否退回（0：未退回，-1：已退回）")
private Integer returnOrNot;
/**
* 20250121 新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分
* 存字符串，不用code表达
*/
@ApiModelProperty("新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分")
private String type;
// /**
// * 20250121 新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分
// * 存字符串，不用code表达
// */
// @ApiModelProperty("新增的一个委托类型，选择生物样本类型后需要区分是 0 委托、1 初筛、 2 两社人员、 3 其他人员， 常规毒品 0 委托 1 初筛，其他的不需要区分")
// private String type;
}

35
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustIdentificationSituationType.java Normal file
View File

@@ -0,0 +1,35 @@
package digital.laboratory.platform.entrustment.enums;
import lombok.Getter;
@Getter
public enum EntrustIdentificationSituationType {
FIRST_IDENT(0, "首次鉴定"),
SUPPLY_IDENT(1, "补充鉴定"),
AFRESF_IDENT(2, "重新鉴定"),
PRIMARY_SCREEN(3, "初筛（不要报告、只要结果）"),
MYANMAR_PERSON(4, "涉缅人员"),
VOLUNTARY_PERSON(5, "自愿戒治人员")
;
private final Integer code;
private final String desc;
EntrustIdentificationSituationType(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
// 根据名称判断是否存在对应枚举
public static EntrustIdentificationSituationType isExist(String desc) {
for (EntrustIdentificationSituationType entrustIdentificationSituationType : values()) {
if (entrustIdentificationSituationType.getDesc().equals(desc)) {
return entrustIdentificationSituationType;
}
}
throw new IllegalArgumentException("No enum constant with desc: " + desc);
}
}

33
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustStatisticType.java
View File

@@ -1,33 +0,0 @@
package digital.laboratory.platform.entrustment.enums;
import lombok.Getter;
@Getter
public enum EntrustStatisticType {
ENTRUST(0, "委托"),
SCREEN(1, "初筛"),
SOCIETY(2, "两社人员"),
OTHER(3, "其他人员")
;
private final Integer code;
private final String desc;
EntrustStatisticType(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
// 根据名称判断是否存在对应枚举
public static EntrustStatisticType isExist(String desc) {
for (EntrustStatisticType entrustStatisticType : values()) {
if (entrustStatisticType.getDesc().equals(desc)) {
return entrustStatisticType;
}
}
throw new IllegalArgumentException("No enum constant with desc: " + desc);
}
}

2
src/main/java/digital/laboratory/platform/entrustment/enums/EntrustmentStatusConstants.java
View File

@@ -30,7 +30,7 @@ public enum EntrustmentStatusConstants {
ENTRUSTMENT_STATUS_WAITING_APPROVE(4, "审批中"), // 审批任务已认领, 待审批
ENTRUSTMENT_STATUS_WAITING_CONFIRM(5, "待送检确认"), // 审批通过, 待送检确认
ENTRUSTMENT_STATUS_WAITING_DELIVER(6, "送检确认通过, 待送检"),
ENTRUSTMENT_STATUS_WAITING_ACCEPT(7, "已送检待受理"),
ENTRUSTMENT_STATUS_WAITING_ACCEPT(7, "待受理"),
//ENTRUSTMENT_STATUS_ACCEPTING(8, "正在受理中"), // 受理过程比较花时间
ENTRUSTMENT_STATUS_ACCEPTED(9, "已受理, 进入检验环节"),