From ec9bdc4942a9fc2d2866bccba87f37df34bb408a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 24 Sep 2024 14:40:37 +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=E6=B5=81=E7=A8=8B=E8=BD=AC=E6=8D=A2=E4=B8=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessEsRevision.java | 159 +----------------- .../ProcessESRevisionEndListener.java | 16 +- 2 files changed, 6 insertions(+), 169 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java index 2adfd967..683d03c9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -115,162 +114,10 @@ public class ProcessEsRevision implements Serializable { private String onEditFile; /** - * 企标编号 + * 业务json数据 */ - @ApiModelProperty(value = "企标编号") - private String standardNumber; - - /** - * 企标名称 - */ - @ApiModelProperty(value = "企标名称") - private String standardName; - - /** - * 企业标准代号 - */ - @ApiModelProperty(value = "企业标准代号") - private String standardCode; - - /** - * 企业名称代号 - */ - @ApiModelProperty(value = "企业名称代号") - private String nameCode; - - /** - * 标准类别代号 - */ - @ApiModelProperty(value = "标准类别代号") - private String categoryCode; - - /** - * 年代号 - */ - @ApiModelProperty(value = "年代号") - private String yearNumber; - - /** - * 企标英文名称 - */ - @ApiModelProperty(value = "企标英文名称") - private String standardEnglishName; - - /** - * 实施日期 - */ - @ApiModelProperty(value = "实施日期") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date implementationDate; - - /** - * 是否试行(0代表不试行，1代表试行) - */ - @ApiModelProperty(value = "是否试行(0代表不试行，1代表试行)") - private String tryFlag; - - /** - * 试行周期 - */ - @ApiModelProperty(value = "试行周期") - private String trialPeriod; - - /** - * 标准状态 - */ - @Dict(dicCode = "enterprise_standard_state") - @ApiModelProperty(value = "标准状态") - private String standardState; - - /** - * 企标体系 - */ - @ApiModelProperty(value = "企标体系") - private String standardSystem; - - /** - * 主起草人 - */ - @ApiModelProperty(value = "主起草人") - private String mainDraftingUser; - - /** - * 主起草单位 - */ - @ApiModelProperty(value = "主起草单位") - private String mainDraftingUnit; - - /** - * 代替标准号 - */ - @ApiModelProperty(value = "代替标准号") - private String substituteStandardNumber; - - /** - * 被代替标准号 - */ - @ApiModelProperty(value = "被代替标准号") - private String replacedByStandardNumber; - - /** - * 引用标准 - */ - @ApiModelProperty(value = "引用标准") - private String referenceStandard; - - /** - * 被引用标准 - */ - @ApiModelProperty(value = "被引用标准") - private String referencedStandard; - - /** - * 涉及系统/部件 - */ - @ApiModelProperty(value = "涉及系统/部件") - private String partName; - - /** - * 标准适用范围 - */ - @ApiModelProperty(value = "标准适用范围") - private String standardScope; - - /** - * 关联文件 - */ - @ApiModelProperty(value = "关联文件") - private String associatedFile; - - /** - * 发布稿（原文） - */ - @ApiModelProperty(value = "发布稿（原文）") - private String publishOfOriginal; - - /** - * 征求意见稿 - */ - @ApiModelProperty(value = "征求意见稿") - private String draftForComment; - - /** - * 顺序号 - */ - @ApiModelProperty(value = "顺序号") - private String standardNumberTemp; - - /** - * 专业领域 - */ - @ApiModelProperty(value = "专业领域") - private String professionalField; - - /** - * 专业模块 - */ - @ApiModelProperty(value = "专业模块") - private String specializedModule; + @ApiModelProperty(value = "业务JSON数据") + private String businessJson; /** * 法规工程师 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java index 9e14c5b5..790cd086 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java @@ -1,9 +1,8 @@ package com.jero.modules.activiti.process.esRevisionAdvice.listener; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.jero.modules.activiti.process.common.enums.StandardStateEnum; import com.jero.modules.activiti.process.esRevisionAdvice.entity.EsRevisionAdvice; import com.jero.modules.activiti.process.esRevisionAdvice.entity.ProcessEsRevision; @@ -11,7 +10,6 @@ import com.jero.modules.activiti.process.esRevisionAdvice.service.EsRevisionAdvi import com.jero.modules.activiti.process.esRevisionAdvice.service.EsRevisionService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; -import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; import com.jero.modules.tag.enums.TableNameEnum; import org.activiti.engine.delegate.DelegateExecution; @@ -62,20 +60,12 @@ public class ProcessESRevisionEndListener implements ExecutionListener { List list = esAdviceService.list(adviceWrapper); if (!list.isEmpty()) { list.forEach(item -> item.setStandardId(esId)); + esAdviceService.updateBatchById(list); } - // 更新企标计划状态 - String espId = data.getEspId(); - EnterpriseStandardPlan esp = espService.getById(espId); - espService.updateById(esp); } private Map transMap(ProcessEsRevision data) { - Map variables; - // 转换 创建 ObjectMapper 实例并设置命名策略 - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); - // 将对象转换为 Map - variables = objectMapper.convertValue(data, Map.class); + Map variables = JSON.parseObject(data.getBusinessJson(), Map.class); variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); // 主起草人 String mainDraftUser = (String) variables.get(MAIN_DRAFT_USER);