From 210fd29b851b63a652a490ef3e6341b2d2ddd3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Sun, 14 Jul 2024 10:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ms/entity/ProcessMarketStandardRelease.java | 11 +++++------ .../impl/ProcessMarketStandardReleaseServiceImpl.java | 4 ++-- .../listener/ProcessNewStandardImportEndListener.java | 8 -------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java index 9dd21266..b164439b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/entity/ProcessMarketStandardRelease.java @@ -31,12 +31,6 @@ public class ProcessMarketStandardRelease implements Serializable { @ApiModelProperty(value = "主键") private String id; - /** - * 标准ID - */ - @ApiModelProperty(value = "标准ID") - private String standardId; - /** * 流程实例id */ @@ -85,6 +79,11 @@ public class ProcessMarketStandardRelease implements Serializable { @Dict(dicCode = "market_state") private String country; + /**抄送人员*/ + @ApiModelProperty(value = "抄送人员") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + private String copyUser; + /** * 标准详情列表 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java index 03cb8f65..d76f97e0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java @@ -124,9 +124,9 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl map = new HashMap<>(); // 人员信息 userInfoMap.forEach((key, value) -> { - if(Objects.equals("moreUserList",key + "List")){ + if(Objects.equals("moreUserList",key)){ map.put(key, value); - map.put(key + "List", Arrays.asList(value.toString().split(","))); + map.put(key, Arrays.asList(value.toString().split(","))); return; } map.put(key, value); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportEndListener.java index f542b9bc..ba7d8a38 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/listener/ProcessNewStandardImportEndListener.java @@ -1,17 +1,9 @@ package com.jero.modules.activiti.process.ni.listener; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.jero.common.util.SpringContextUtils; -import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; -import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService; -import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.delegate.DelegateExecution; -import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.ExecutionListener; -import org.activiti.engine.delegate.TaskListener; import org.springframework.stereotype.Component; import javax.annotation.Resource;