From 701c612bae3eaa0c32ef0ba59b7ba8cab388387e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 21 二月 2025 10:48:58 +0800
Subject: [PATCH] 审批流修改
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java | 6 +++---
ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java | 10 ++++++----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 6 ++++--
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 4 ++--
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
index 7b7dba6..954a2ed 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
@@ -1,6 +1,8 @@
package com.ruoyi.common.config;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.context.annotation.Configuration;
@@ -27,14 +29,14 @@
@Override
public void insertFill(MetaObject metaObject) {
// 获取登录信息
- /* String userName = JwtTokenUtils.getUsername();
+ String userName = SecurityUtils.getUsername();
if (StringUtils.isNotBlank(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("updateBy", userName, metaObject);
} else {
this.setFieldValByName("createBy", "", metaObject);
this.setFieldValByName("updateBy", "", metaObject);
- }*/
+ }
}
/**
@@ -45,13 +47,13 @@
@Override
public void updateFill(MetaObject metaObject) {
// 获取登录信息
- /*String userName = JwtTokenUtils.getUsername();
+ String userName = SecurityUtils.getUsername();
if (StringUtils.isNotBlank(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("updateBy", userName, metaObject);
} else {
this.setFieldValByName("createBy", "", metaObject);
this.setFieldValByName("updateBy", "", metaObject);
- }*/
+ }
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
index 0b27e26..5aef891 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
@@ -13,9 +13,9 @@
@AllArgsConstructor
public enum ProcessCategoryEnum {
CATEGORY0(0, "错误分类"),
- CATEGORY1(1, "入户调查"),
- CATEGORY2(2, "价格评估"),
- CATEGORY3(3, "协议签订"),
+ CATEGORY1(1, "合同新增审批"),
+ CATEGORY2(2, "合同签订审批"),
+ CATEGORY3(3, "合同提前终止审批"),
;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 63dec62..12c8605 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -44,12 +44,12 @@
private String contractName;
@ApiModelProperty(value = "开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("start_time")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("end_time")
private LocalDateTime endTime;
@ApiModelProperty(value = "开始计费时间")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index b144e21..598a8a1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -249,7 +249,9 @@
//监听器参数补全
processStartBO.getVariable().put("category", processStartBO.getCategory());
// 开启流程
- flowLongEngine.startInstanceById(flwProcess.getId(), creator, processStartBO.getVariable()).ifPresent(instance -> {
+ Optional<FlwInstance> flwInstanceOptional = flowLongEngine.startInstanceById(flwProcess.getId(), creator, processStartBO.getVariable());
+ if(flwInstanceOptional.isPresent()){
+ FlwInstance instance = flwInstanceOptional.get();
//存储任务中心信息
StateTaskCenter stateTaskCenter = new StateTaskCenter();
stateTaskCenter.setId(IdUtils.simpleUUID());
@@ -279,7 +281,7 @@
//保存version
stateProcessExtInstance.setProcessVersion(flwProcess.getProcessVersion());
stateProcessExtInstanceService.save(stateProcessExtInstance);
- });
+ }
return true;
}
--
Gitblit v1.7.1