From 9825ef648839a99e38af6a4f77fc3ea38e22d8f3 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Wed, 13 Aug 2025 14:50:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E4=BA=BA=E5=91=98=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/system/domain/TdApplyInfoList.java | 3 +++ .../java/com/ruoyi/system/manager/ApplyInfoListManager.java | 6 +++--- .../main/java/com/ruoyi/common/core/domain/BaseEntity.java | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/TdApplyInfoList.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/TdApplyInfoList.java index ff0433f..e5b1f2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/TdApplyInfoList.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/TdApplyInfoList.java @@ -1,6 +1,8 @@ package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; @@ -16,6 +18,7 @@ public class TdApplyInfoList extends BaseEntity { /** * 主键 */ + @TableId(type = IdType.INPUT) private String applyId; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/manager/ApplyInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/system/manager/ApplyInfoListManager.java index 7916074..337627e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/manager/ApplyInfoListManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/manager/ApplyInfoListManager.java @@ -74,14 +74,14 @@ public class ApplyInfoListManager { return applyInfoListService.lambdaQuery().eq(TdApplyInfoList::getApplyId, applyId).one(); } - + @Transactional(rollbackFor = Exception.class) public boolean insertTdApplyInfoList(TdApplyInfoList applyInfoList) { // 设置流转参数 String id = IdUtils.nextIdStr(); applyInfoList.setApplyId(id); LoginUser user = SecurityUtils.getLoginUser(); // 从字典表中获取流程编码 - String flowCode = getFlowType(1L); + String flowCode = getFlowType(0L); // 传递流程编码,绑定流程定义 【必传】 FlowParams flowParams = FlowParams.build().flowCode(flowCode); // 设置办理人唯一标识,保存为流程实例的创建人 【必传】 @@ -185,7 +185,7 @@ public class ApplyInfoListManager { applyInfoList.setNodeName(instance.getNodeName()); applyInfoList.setNodeType(instance.getNodeType()); applyInfoList.setFlowStatus(instance.getFlowStatus()); - if ("PASS".equals(skipType)) { + if (SkipType.PASS.getKey().equals(skipType)) { applyInfoList.setApplyStatus(ApplyListStatusEnum.AUDITED.getStatus()); } else { applyInfoList.setApplyStatus(ApplyListStatusEnum.GOBACK.getStatus()); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 15bf66b..35d0548 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +21,7 @@ public class BaseEntity implements Serializable /** 搜索值 */ @JsonIgnore + @TableField(exist=false) private String searchValue; /** 创建者 */ @@ -40,6 +43,7 @@ public class BaseEntity implements Serializable /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist=false) private Map params; public String getSearchValue()