From 67efe2c14617cad2e8367e27cd3f4b45eb749c38 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 20 二月 2025 14:46:49 +0800
Subject: [PATCH] 审批流
---
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 4 ++++
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 35 +++++++++++++++++++++++------------
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java | 4 +++-
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java | 2 ++
8 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index b5354e9..558fe10 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -5,12 +5,14 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.core.env.Environment;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.client.RestTemplate;
+import springfox.documentation.oas.annotations.EnableOpenApi;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -21,6 +23,8 @@
* @author ruoyi
*/
@Slf4j
+@EnableOpenApi
+@EnableCaching
@EnableScheduling//开启定时任务
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java
index 34a4f30..3d15679 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java
@@ -7,8 +7,10 @@
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = false)
@TableName(value = "state_process_ext_instance")
public class StateProcessExtInstance extends BaseModel {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
index 93c1d27..b80da00 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
@@ -8,8 +8,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "工作流-实例操作记录表")
@TableName(value = "state_process_instance_action")
public class StateProcessInstanceAction extends BaseModel {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
index 9d3c826..5b41fda 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
@@ -7,8 +7,10 @@
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = false)
@TableName(value = "state_process_module")
public class StateProcessModule extends BaseModel {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java
index 2dd679d..fef5305 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java
@@ -8,8 +8,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "工作流-模版")
@TableName(value = "state_process_template")
public class StateProcessTemplate extends BaseModel {
@@ -38,7 +40,7 @@
@TableField("status")
private Integer status;
@ApiModelProperty(value = "workflow_id")
- @TableField("workflow_id")
+ @TableField("work_flow_id")
private Long workFlowId;
@ApiModelProperty(value = "workflow流程版本")
@TableField("workflow_version")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
index 3386057..310fb95 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
@@ -8,8 +8,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "任务")
@TableName(value = "state_task_center" )
public class StateTaskCenter extends BaseModel {
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 cbb7588..b144e21 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
@@ -34,6 +34,7 @@
import com.ruoyi.system.vo.ProcessTaskListVO;
import lombok.AllArgsConstructor;
import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -46,20 +47,30 @@
import java.util.stream.Collectors;
@Service
-@AllArgsConstructor
public class StateProcessTemplateServiceImpl extends ServiceImpl<StateProcessTemplateMapper, StateProcessTemplate> implements StateProcessTemplateService {
- private final FlowLongEngine flowLongEngine;
- private final StateProcessInstanceActionService stateProcessInstanceActionService;
- private final StateProcessExtInstanceService stateProcessExtInstanceService;
- private final FlwHisInstanceMapper flwHisInstanceMapper;
- private final FlwTaskActorMapper flwTaskActorMapper;
- private final FlwTaskMapper flwTaskMapper;
- private final StateTaskCenterService stateTaskCenterService;
- private final StateProcessModuleService stateProcessModuleService;
- private final FlwHisTaskMapper flwHisTaskMapper;
- private final FlwHisTaskActorMapper flwHisTaskActorMapper;
- private final ISysUserService sysUserService;
+ @Autowired
+ private FlowLongEngine flowLongEngine;
+ @Autowired
+ private StateProcessInstanceActionService stateProcessInstanceActionService;
+ @Autowired
+ private StateProcessExtInstanceService stateProcessExtInstanceService;
+ @Autowired
+ private FlwHisInstanceMapper flwHisInstanceMapper;
+ @Autowired
+ private FlwTaskActorMapper flwTaskActorMapper;
+ @Autowired
+ private FlwTaskMapper flwTaskMapper;
+ @Autowired
+ private StateTaskCenterService stateTaskCenterService;
+ @Autowired
+ private StateProcessModuleService stateProcessModuleService;
+ @Autowired
+ private FlwHisTaskMapper flwHisTaskMapper;
+ @Autowired
+ private FlwHisTaskActorMapper flwHisTaskActorMapper;
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 流程模版分页
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
index 385b4d0..cbff79f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -82,7 +82,7 @@
</select>
<select id="pageListApplet" resultType="com.ruoyi.system.vo.TCheckAcceptRecordVO">
select
- t1.*,
+ t.*,
c.contract_number,
h.house_name
from t_check_accept_record t
--
Gitblit v1.7.1