From 3109a64a7ed46cfcd3169814aa80cad3ab918500 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Thu, 2 Mar 2023 09:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/mapper/WorkOrderMapper.java         | 15 +++++++++++++++
 .../workorder/service/IWorkOrderService.java      |  4 +++-
 .../service/impl/WorkOrderServiceImpl.java        |  6 +++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/mapper/WorkOrderMapper.java

diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/mapper/WorkOrderMapper.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/mapper/WorkOrderMapper.java
new file mode 100644
index 0000000..a764bf7
--- /dev/null
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/mapper/WorkOrderMapper.java
@@ -0,0 +1,15 @@
+
+package org.springblade.plugin.operation.workorder.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.plugin.operation.task.entity.TaskInfo;
+import org.springblade.plugin.operation.workorder.entity.WorkOrder;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ */
+public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+
+}
diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/IWorkOrderService.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/IWorkOrderService.java
index 42884ad..d353210 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/IWorkOrderService.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/IWorkOrderService.java
@@ -2,8 +2,10 @@ package org.springblade.plugin.operation.workorder.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.flowable.engine.history.HistoricProcessInstance;
+import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.plugin.operation.task.entity.TaskInfo;
 import org.springblade.plugin.operation.workorder.entity.WorkOrder;
 import org.springblade.plugin.workflow.process.model.WfProcess;
 
@@ -16,7 +18,7 @@ import java.util.Map;
  * @Author lt
  * @Date 2023-2-17 09:49:24
  */
-public interface IWorkOrderService {
+public interface IWorkOrderService extends BaseService<WorkOrder> {
 
     IPage<Map<String, Object>> historyWorkOrder(WorkOrder workOrder, Query query);
 
diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
index 79d321a..5af19c7 100644
--- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.java
@@ -16,6 +16,7 @@ import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.task.api.history.HistoricTaskInstanceQuery;
 import org.flowable.variable.api.history.HistoricVariableInstance;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -23,8 +24,11 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.plugin.operation.database.service.IDataBaseService;
 import org.springblade.plugin.operation.system.entity.ProjectInfo;
 import org.springblade.plugin.operation.system.service.IProjectInfoService;
+import org.springblade.plugin.operation.task.entity.TaskInfo;
+import org.springblade.plugin.operation.task.mapper.TaskInfoMapper;
 import org.springblade.plugin.operation.workorder.entity.WorkOrder;
 import org.springblade.plugin.operation.workorder.excel.WorkOrderExcel;
+import org.springblade.plugin.operation.workorder.mapper.WorkOrderMapper;
 import org.springblade.plugin.operation.workorder.service.IWorkOrderService;
 import org.springblade.plugin.workflow.core.utils.WfTaskUtil;
 import org.springblade.system.cache.DictBizCache;
@@ -45,7 +49,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
-public class WorkOrderServiceImpl implements IWorkOrderService {
+public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkOrder> implements IWorkOrderService {
     private final TaskService taskService;
     private final HistoryService historyService;
     private final RuntimeService runtimeService;