From 80648e1f590412f2bb9bfbd642587e40444e2cba Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Apr 2022 18:55:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=8F=82=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/renren/common/controller/AbilityCenterController.java | 4 ++-- .../modules/processForm/dto/TAbilityBatchApplicationDTO.java | 5 +++-- .../modules/processForm/listener/CorrectionListener.java | 3 +++ .../modules/processForm/listener/DataCenterListener.java | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java index abbd9d5c..12ce91f7 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java @@ -76,9 +76,9 @@ public class AbilityCenterController { tAbilityApplicationDTO.setInstanceId(abilityBatchApplicationDTO.getInstanceId()); tAbilityApplicationDTO.setUnit(abilityBatchApplicationDTO.getUnit()); tAbilityApplicationDTO.setUser(abilityBatchApplicationDTO.getUser()); - tAbilityApplicationDTO.setResourceId(abilityBatchApplicationDTO.getResourceId()); + tAbilityApplicationDTO.setResourceId(index.get("resourceId")); tAbilityApplicationDTO.setUser(abilityBatchApplicationDTO.getUser()); - tAbilityApplicationDTO.setSystem(index); + tAbilityApplicationDTO.setSystem(index.get("resourceName")); // 仿照请求接口 /processForm/tabilityapplication ValidatorUtils.validateEntity(tAbilityApplicationDTO, AddGroup.class, DefaultGroup.class); tAbilityApplicationService.save(tAbilityApplicationDTO); // 写能力申请数据 diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java index 0da0d475..7edbba6b 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dto/TAbilityBatchApplicationDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +import java.util.Map; @Data @@ -23,7 +24,7 @@ public class TAbilityBatchApplicationDTO implements Serializable { @ApiModelProperty(value = "申请人所在地区") private String area; @ApiModelProperty(value = "申请应用系统") - private List system; + private List> system; @ApiModelProperty(value = "申请场景") private String scene; @ApiModelProperty(value = "申请依据") @@ -32,7 +33,7 @@ public class TAbilityBatchApplicationDTO implements Serializable { private String attachment; @ApiModelProperty(value = "实例ID") private String instanceId; - + @ApiModelProperty(value = "资源id") private String resourceId; @ApiModelProperty(value = "用户id") diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java index 9e681ff5..091d5b49 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java @@ -23,6 +23,9 @@ import org.springframework.stereotype.Component; import java.util.Map; +/** + * 部门动态审批人 + */ @Component public class CorrectionListener implements TaskListener, ExecutionListener, ActivitiEventListener, JavaDelegate { private static Logger logger = LoggerFactory.getLogger(CorrectionListener.class); diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java index 4b2881cc..9e546782 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java @@ -16,7 +16,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - +/** + * 大数据局动态审批人 + */ @Component public class DataCenterListener implements TaskListener, ExecutionListener, ActivitiEventListener, JavaDelegate { private static Logger logger = LoggerFactory.getLogger(DataCenterListener.class);