From 16be1a4874fa27134ebb1b6f6845c28d73b98285 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 20 Dec 2023 11:21:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=20=E6=89=8B=E5=8A=A8=E5=8F=91=E8=B5=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esRevision/entity/OtherDraftUser.java | 30 +++++++++++++++++++ .../esRevision/entity/ProcessEsRevision.java | 12 +++++++- .../service/impl/EsRevisionServiceImpl.java | 11 +++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/OtherDraftUser.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/OtherDraftUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/OtherDraftUser.java new file mode 100644 index 00000000..a3295791 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/OtherDraftUser.java @@ -0,0 +1,30 @@ +package com.jero.modules.activiti.process.esRevision.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author: Mzaxd + * @Date: 2023/12/20 10:16 + */ + +@Data +public class OtherDraftUser { + + @ApiModelProperty(value = "起草人责任单位") + private String dept; + + @ApiModelProperty(value = "起草人") + private String user; + + @ApiModelProperty(value = "起草范围") + private String scope; + + @ApiModelProperty(value = "截止日期") + private Date deadline; + + @ApiModelProperty(value = "文件ID") + private String fileId; +} 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 3be457d3..faec0f6b 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 @@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import java.util.List; +import java.util.Map; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,7 +69,6 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "流程实例Id") private String processInstanceId; - /** * 业务json数据 */ @@ -184,6 +186,14 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "总工程师") private String chiefEngineer; + @TableField(exist = false) + @ApiModelProperty(value = "其他起草人") + private List otherDraftUsers; + + @TableField(exist = false) + @ApiModelProperty(value = "稽查内容") + private List inspectContents; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file 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 1b0484e5..a1149a0e 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 @@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; +import com.jero.modules.activiti.process.esRevision.entity.OtherDraftUser; import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision; import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO; import com.jero.modules.activiti.process.esRevision.service.EsRevisionService; @@ -15,6 +16,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; @@ -24,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * @author ThinkBook @@ -92,6 +95,14 @@ public class EsRevisionServiceImpl extends ServiceImpl flowUser = revisionData.getFlowUser(); ProcessEsRevision data = revisionData.getData(); actVariables.put("mainDraftUser", flowUser.get("mainDraftUser")); + List otherDraftUsers = data.getOtherDraftUsers(); + if (otherDraftUsers == null || otherDraftUsers.isEmpty()) { + actVariables.put("distribute", false); + } else { + actVariables.put("distribute", true); + actVariables.put("otherDraftUserList", otherDraftUsers.stream().map(OtherDraftUser::getUser) + .collect(Collectors.toList())); + } // 获取分发人 return actVariables; }