From e0e04586299fa68c18371c25d3232426a2b28e44 Mon Sep 17 00:00:00 2001 From: wsm <2746563060@qq.com> Date: Wed, 22 Jul 2026 17:13:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(xispeak):=20=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=B8=B8=E9=87=8FBpmStatus=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80bpmStatus=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新建BpmStatus枚举类（NOT_START/SUPERVISING/FINISH） - 新建SupervisionConstant公共常量类（DelFlag/ClassFieldName） - BgXiSpeak/BgXiSpeakFeedback实体bpmStatus字段Integer改String - 更新Controller/ServiceImpl引用，使用枚举比较替代字符串常量 --- .../jeecg/modules/bg/constant/BpmStatus.java | 37 +++++++++++++++++++ .../bg/constant/SupervisionConstant.java | 25 +++++++++++++ .../bg/xispeak/constant/XiSpeakConstant.java | 1 + .../controller/BgXiSpeakController.java | 20 +++++++--- .../modules/bg/xispeak/entity/BgXiSpeak.java | 2 +- .../bg/xispeak/entity/BgXiSpeakFeedback.java | 2 +- .../service/impl/BgXiSpeakServiceImpl.java | 3 +- 7 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java create mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java new file mode 100644 index 0000000..adfdbe8 --- /dev/null +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java @@ -0,0 +1,37 @@ +package org.jeecg.modules.bg.constant; + +import java.util.Arrays; + +/** + * 流程业务状态 + */ +public enum BpmStatus { + + NOT_START("1", "未发起"), + SUPERVISING("2", "督办中"), + FINISH("3", "已完成"); + + private final String code; + private final String label; + + BpmStatus(String code, String label) { + this.code = code; + this.label = label; + } + + public String getCode() { + return code; + } + + public String getLabel() { + return label; + } + + public static BpmStatus fromCode(String code) { + if (code == null) return null; + return Arrays.stream(values()) + .filter(s -> s.code.equals(code)) + .findFirst() + .orElse(null); + } +} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java new file mode 100644 index 0000000..b4d77ee --- /dev/null +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java @@ -0,0 +1,25 @@ +package org.jeecg.modules.bg.constant; + +/** + * 监督模块通用常量 + */ +public final class SupervisionConstant { + + private SupervisionConstant() { + throw new UnsupportedOperationException("This is a constant class and cannot be instantiated"); + } + + /** 删除标记 */ + public static final class DelFlag { + /** 未删除 */ + public static final String NORMAL = "0"; + /** 已删除 */ + public static final String DELETED = "1"; + } + + /** Java 属性名（用于反射/PropertyUtils） */ + public static final class ClassFieldName { + public static final String BPM_STATUS_NAME = "bpmStatus"; + public static final String DEL_FLAG_NAME = "delFlag"; + } +} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java index c45279e..9d4d5ee 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/constant/XiSpeakConstant.java @@ -15,4 +15,5 @@ public final class XiSpeakConstant { public static final int FINISHED = 1; // 已完成 public static final int UN_FINISHED = 0; // 未完成 } + } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java index b8db431..2916b00 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/BgXiSpeakController.java @@ -20,6 +20,9 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; +import org.jeecg.modules.bg.constant.BpmStatus; +import org.jeecg.modules.bg.constant.SupervisionConstant; + import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback; import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakService; @@ -28,6 +31,8 @@ import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService; import org.jeecg.modules.bg.xispeak.dto.BgXiSpeakBpmSaveDTO; import org.flowable.engine.RuntimeService; import com.alibaba.fastjson.JSONObject; +import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant; +import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter; import org.jeecg.modules.tasktask.entity.TaskTask; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -114,15 +119,15 @@ public class BgXiSpeakController extends JeecgController importExcelByEasyExcel(HttpServletRequest request) { - return super.importExcelByEasyExcel(request, BgXiSpeak.class); + return super.importExcelByEasyExcel(request,BgXiSpeak.class, + Map.of( + SupervisionConstant.ClassFieldName.BPM_STATUS_NAME, + BpmStatus.NOT_START.getCode(), + SupervisionConstant.ClassFieldName.DEL_FLAG_NAME, + SupervisionConstant.DelFlag.NORMAL)); } /** diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java index bb19d6d..acc8a50 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java @@ -183,7 +183,7 @@ public class BgXiSpeak implements Serializable { /**流程引擎状态字段*/ @Dict( dicCode = "super_status" ) @Schema(description = "督办状态") - private java.lang.Integer bpmStatus; + private java.lang.String bpmStatus; /**督办次数*/ @Excel(name = "督办次数", width = 15) @ExcelColumn(name = "督办次数", width = 15) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java index 2670133..74bfffe 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java @@ -157,7 +157,7 @@ public class BgXiSpeakFeedback implements Serializable { /**流程引擎状态字段*/ @Excel(name = "流程引擎状态字段", width = 15) @Schema(description = "流程引擎状态字段") - private java.lang.Integer bpmStatus; + private java.lang.String bpmStatus; /**审批信息Map*/ @TableField(typeHandler = JacksonTypeHandler.class) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java index b0c43e9..b25ddf0 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/service/impl/BgXiSpeakServiceImpl.java @@ -9,6 +9,7 @@ import java.util.Objects; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.SelectTreeModel; +import org.jeecg.modules.bg.constant.BpmStatus; import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak; import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail; import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap; @@ -53,7 +54,7 @@ public class BgXiSpeakServiceImpl extends ServiceImpl