main
litao 3 years ago
parent 88cddc9857
commit 3109a64a7e
  1. 15
      lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/mapper/WorkOrderMapper.java
  2. 4
      lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/IWorkOrderService.java
  3. 6
      lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/operation/workorder/service/impl/WorkOrderServiceImpl.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> {
}

@ -2,8 +2,10 @@ package org.springblade.plugin.operation.workorder.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.flowable.engine.history.HistoricProcessInstance; import org.flowable.engine.history.HistoricProcessInstance;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; 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.operation.workorder.entity.WorkOrder;
import org.springblade.plugin.workflow.process.model.WfProcess; import org.springblade.plugin.workflow.process.model.WfProcess;
@ -16,7 +18,7 @@ import java.util.Map;
* @Author lt * @Author lt
* @Date 2023-2-17 09:49:24 * @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); IPage<Map<String, Object>> historyWorkOrder(WorkOrder workOrder, Query query);

@ -16,6 +16,7 @@ import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery; import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.flowable.variable.api.history.HistoricVariableInstance; import org.flowable.variable.api.history.HistoricVariableInstance;
import org.springblade.core.excel.util.ExcelUtil; 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.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil; 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.database.service.IDataBaseService;
import org.springblade.plugin.operation.system.entity.ProjectInfo; import org.springblade.plugin.operation.system.entity.ProjectInfo;
import org.springblade.plugin.operation.system.service.IProjectInfoService; 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.entity.WorkOrder;
import org.springblade.plugin.operation.workorder.excel.WorkOrderExcel; 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.operation.workorder.service.IWorkOrderService;
import org.springblade.plugin.workflow.core.utils.WfTaskUtil; import org.springblade.plugin.workflow.core.utils.WfTaskUtil;
import org.springblade.system.cache.DictBizCache; import org.springblade.system.cache.DictBizCache;
@ -45,7 +49,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
@AllArgsConstructor @AllArgsConstructor
public class WorkOrderServiceImpl implements IWorkOrderService { public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkOrder> implements IWorkOrderService {
private final TaskService taskService; private final TaskService taskService;
private final HistoryService historyService; private final HistoryService historyService;
private final RuntimeService runtimeService; private final RuntimeService runtimeService;

Loading…
Cancel
Save