Browse Source

[feat] 审批模块管理

新增 工程管理物料处理类、工程管理Bom代办处理类、工程管理开发修改单代办处理类、工程管理开发修改单领料代办处理类,统一实现流程任务处理统一接口实现里面的handleTask方法,每个类上面@Service注解加上对应的key,当通用办理功能从前端传入taskId的时候,找到流程实例类,找到processDefinitionKey,不同的找到processDefinitionKey会找到对应的handleTask类,用于跳转不同的模块页面
修改
待办事项服务实现类:加上上面四个单据对应的key和url
dev
liuxiaoxu 2 months ago
parent
commit
a5cc87d5fd
  1. 43
      ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/BomTaskHandler.java
  2. 42
      ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderPickingTaskHandler.java
  3. 42
      ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderTaskHandler.java
  4. 44
      ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MaterialTaskHandler.java
  5. 9
      ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java

43
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/BomTaskHandler.java

@ -0,0 +1,43 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.erp.domain.ErpBomVo;
import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.erp.service.IErpBomService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
/**
* 工程管理Bom代办处理类
* */
@Service("erpBom")
public class BomTaskHandler implements TaskHandler {
@Autowired
private IErpBomService erpBomService;
@Autowired
private TaskService taskService;
@Autowired
private IToDoItemService toDoItemService;
@Override
public void handleTask(String taskId, ModelMap mmap) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 业务逻辑...
ProcessInstance processInstance = toDoItemService.getProcessInstance(taskId);
ErpBomVo erpBomVo = erpBomService.selectErpBomById(new Long(processInstance.getBusinessKey()));
mmap.put("formData", erpBomVo);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

42
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderPickingTaskHandler.java

@ -0,0 +1,42 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderPickingVo;
import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo;
import com.ruoyi.erp.service.IErpDevelopModifyorderPickingService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
/**
* 开发修改单领料代办处理类
* */
@Service("developModifyOrderPicking")
public class DevelopModifyOrderPickingTaskHandler implements TaskHandler {
@Autowired
private IErpDevelopModifyorderPickingService erpDevelopModifyorderPickingService;
@Autowired
private TaskService taskService;
@Autowired
private IToDoItemService toDoItemService;
@Override
public void handleTask(String taskId, ModelMap mmap) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 业务逻辑...
ProcessInstance processInstance = toDoItemService.getProcessInstance(taskId);
ErpDevelopModifyorderPickingVo erpDevelopModifyorderPickingVo = erpDevelopModifyorderPickingService.selectErpDevelopModifyorderPickingById(new Long(processInstance.getBusinessKey()));
mmap.put("formData", erpDevelopModifyorderPickingVo);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

42
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/DevelopModifyOrderTaskHandler.java

@ -0,0 +1,42 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo;
import com.ruoyi.erp.service.IErpDevelopModifyorderService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
/**
* 开发修改单代办处理类
* */
@Service("developModifyOrder")
public class DevelopModifyOrderTaskHandler implements TaskHandler {
@Autowired
private IErpDevelopModifyorderService erpDevelopModifyorderService;
@Autowired
private TaskService taskService;
@Autowired
private IToDoItemService toDoItemService;
@Override
public void handleTask(String taskId, ModelMap mmap) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 业务逻辑...
ProcessInstance processInstance = toDoItemService.getProcessInstance(taskId);
ErpDevelopModifyorderVo erpDevelopModifyorderVo = erpDevelopModifyorderService.selectErpDevelopModifyorderById(new Long(processInstance.getBusinessKey()));
mmap.put("formData", erpDevelopModifyorderVo);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

44
ruoyi-admin/src/main/java/com/ruoyi/common/handler/impl/MaterialTaskHandler.java

@ -0,0 +1,44 @@
package com.ruoyi.common.handler.impl;
import com.ruoyi.common.handler.TaskHandler;
import com.ruoyi.common.service.IToDoItemService;
import com.ruoyi.erp.domain.ErpMaterialVo;
import com.ruoyi.erp.service.IErpMaterialService;
import com.ruoyi.system.domain.Vo.BaseRequisitioningOrderVo;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.ModelMap;
/**
* 工程管理物料代办处理类
* */
@Service("material")
public class MaterialTaskHandler implements TaskHandler {
@Autowired
private IErpMaterialService erpMaterialService;
@Autowired
private TaskService taskService;
@Autowired
private IToDoItemService toDoItemService;
@Override
public void handleTask(String taskId, ModelMap mmap) {
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 业务逻辑...
ProcessInstance processInstance = toDoItemService.getProcessInstance(taskId);
ErpMaterialVo erpMaterialVo = erpMaterialService.selectErpMaterialById(new Long(processInstance.getBusinessKey()));
mmap.put("formData", erpMaterialVo);
mmap.put("taskId", taskId);
String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
mmap.put("verifyName", verifyName);
}
}

9
ruoyi-admin/src/main/java/com/ruoyi/common/service/impl/IToDoItemServiceImpl.java

@ -58,6 +58,15 @@ public class IToDoItemServiceImpl implements IToDoItemService {
return "system/baseExpense";
case "evection":
return "system/baseEvectionForm";
case "material":
return "erp/material";
case "erpBom":
return "erp/bom";
case "developModifyOrder":
return "erp/developModifyOrder";
case "developModifyOrderPicking":
return "erp/developModifyorderPicking";
// 其他case...
default:
return "defaultPrefix";

Loading…
Cancel
Save