From 651e594f81c2e034f53d9a1f4e1fd030b5a426f4 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 12 Oct 2023 10:25:18 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/enums/ProcessType.java | 50 +++++++++++++++++++ .../common/service/ActFlowCommonService.java | 2 +- .../entity/ProcessEsInitChange.java | 10 ++++ .../impl/ProcessEsInitChangeServiceImpl.java | 6 ++- .../entity/EnterpriseStandardPlan.java | 7 ++- .../xml/EnterpriseStandardPlanMapper.xml | 10 ++-- 6 files changed, 75 insertions(+), 10 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java new file mode 100644 index 00000000..1b384be0 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java @@ -0,0 +1,50 @@ +package com.jero.modules.activiti.process.common.enums; + +/** + * @author: Mzaxd + * @Date: 2023/10/12 9:37 + * 流程类型 + */ + +public enum ProcessType { + + /** + * 企标立项变更 + */ + ES_INIT_CHANGE("企标立项/变更计划", "1", "es-init-change"), + + ; + + private final String name; + private final String value; + private final String processKey; + + ProcessType(String name, String value, String processKey) { + this.name = name; + this.value = value; + this.processKey = processKey; + } + + public String getProcessTypeNameByProcessKey(String processKey) { + for (ProcessType processType : ProcessType.values()) { + if (processType.getProcessKey().equals(processKey)) { + return processType.getName(); + } + } + return null; + } + + public String getName() { + return name; + } + + public String getValue() { + return value; + } + + public String getProcessKey() { + return processKey; + } +} + + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 188359e9..af66efdf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -73,7 +73,7 @@ public class ActFlowCommonService { Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); if (task == null) { - log.error("completeProcess - task is null!!"); + log.error("找不到对应任务"); throw new JeroBootException("找不到对应任务"); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index 618ada07..d1d3e57d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -279,6 +279,11 @@ public class ProcessEsInitChange implements Serializable { */ private String remarks; + /** + * 上传附件 + */ + private String uploadAttachment; + /** * 附件 */ @@ -354,6 +359,11 @@ public class ProcessEsInitChange implements Serializable { */ private String authDept; + /** + * 配合单位 + */ + private String cooperationUnit; + @TableField(exist = false) private static final long serialVersionUID = 1781238971297838971L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index 0041c6bf..63d8d5d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -83,9 +83,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl esInitChange) { // TODO 保存到草稿 + + saveOrUpdateBatch(esInitChange); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java index 52579d93..250f815d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java @@ -225,8 +225,8 @@ public class EnterpriseStandardPlan implements Serializable { @ApiModelProperty(value = "备注") private String remarks; - @ApiModelProperty(value = "附件") - private String attachment; + @ApiModelProperty(value = "上传附件") + private String uploadAttachment; @TableField(exist = false) @ApiModelProperty(value = "附件文件名") @@ -238,4 +238,7 @@ public class EnterpriseStandardPlan implements Serializable { @TableField(exist = false) private String qualityFlag_dictText; + @ApiModelProperty(value = "配合单位") + private String cooperationUnit; + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index 8dd188cc..57c20c5e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -54,8 +54,9 @@ - + + @@ -75,7 +76,7 @@ review_date,approval_date,release_date, change_status,project_background,similar_na_standards_analysis, similar_en_standards_analysis,standard_leading_necessity,project_expected_effects, - remarks,attachment,qualityFlag + remarks,attachment,qualityFlag,cooperationUnit