From 9d0f999244b76f427409076fe9a428d566dbb302 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Dec 2023 15:39:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E5=85=B6=E4=BB=96=E5=87=BA=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E4=BA=BA=E4=B8=8A=E4=BC=A0=E5=90=8E=E5=9B=9E=E6=98=BE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/esRevision/entity/ProcessEsRevision.java | 7 ------- .../process/esRevision/entity/vo/OtherDraftUserVO.java | 1 + .../esRevision/service/impl/EsRevisionServiceImpl.java | 8 ++------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java index 0235ae4f..6673d29a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java @@ -215,13 +215,6 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "相关部门领导") private String relatedLeader; - /** - * 其他起草人上传文件Id - */ - @TableField(exist = false) - @ApiModelProperty(value = "其他起草人上传文件Id") - private String otherDrafterUploadFileId; - /** * 授权部门 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java index 6aa7b7e7..2748c20c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java @@ -33,6 +33,7 @@ public class OtherDraftUserVO { @ApiModelProperty(value = "截止日期") private Date deadline; + @Dict(dicCode = "id", dicText = "file_name", dictTable = "oss_file") @ApiModelProperty(value = "文件ID") private String fileId; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 160a29a8..ca705a9e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -323,18 +323,14 @@ public class EsRevisionServiceImpl extends ServiceImpl otherDraftUserVOListDB = dataDb.parseOtherDraftUserVOS(); - Map map = otherDraftUserVOListDB.stream() - .collect(Collectors.toMap(OtherDraftUserVO::getUser, o -> o)); - OtherDraftUserVO otherDraftUserVO = map.get(userId); - otherDraftUserVO.setFileId(data.getOtherDrafterUploadFileId()); + List otherDraftUserVOListDB = data.getOtherDraftUserVOS(); dataDb.setOtherDrafterUploadFileJson(otherDraftUserVOListDB); saveOrUpdate(dataDb); break; case MAIN_DRAFT_USER_COLLECT_FIRST: // 判断是否需要稽查 设置流程变量 保存稽查列表 data = revisionData.getData(); - boolean inspectFlag = !data.getInspectFlag().equals("0"); + boolean inspectFlag = !data.getInspectFlag().equals(YesOrNoEnum.NO.getValue()); if (inspectFlag) { List inspectContents = data.getInspectContents(); data.setInspectContentJson(inspectContents);