|
@@ -14,6 +14,8 @@ import com.ruoyi.framework.web.controller.BaseController;
|
|
import com.ruoyi.framework.web.domain.AjaxResult;
|
|
import com.ruoyi.framework.web.domain.AjaxResult;
|
|
import com.ruoyi.framework.web.page.TableDataInfo;
|
|
import com.ruoyi.framework.web.page.TableDataInfo;
|
|
import com.ruoyi.project.approve.damain.DevTask;
|
|
import com.ruoyi.project.approve.damain.DevTask;
|
|
|
|
+import com.ruoyi.project.listener.invoiceApprove.YhzgTaskCreateListener;
|
|
|
|
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
|
|
import com.ruoyi.project.plant.domain.TStaffmgr;
|
|
import com.ruoyi.project.plant.domain.TStaffmgr;
|
|
import com.ruoyi.project.pssr.domain.*;
|
|
import com.ruoyi.project.pssr.domain.*;
|
|
import com.ruoyi.project.pssr.service.*;
|
|
import com.ruoyi.project.pssr.service.*;
|
|
@@ -590,6 +592,7 @@ public class TPssrApproveController extends BaseController {
|
|
Map<String, Object> variables = new HashMap<>();
|
|
Map<String, Object> variables = new HashMap<>();
|
|
variables.put("applyUser", userId);
|
|
variables.put("applyUser", userId);
|
|
variables.put("allJlUsers", executor);
|
|
variables.put("allJlUsers", executor);
|
|
|
|
+ variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
|
|
variables.put("jlUser", aboveall.getPlantMgr());
|
|
variables.put("jlUser", aboveall.getPlantMgr());
|
|
|
|
|
|
TPssrApprove exist = tPssrApproveService.selectTPssrApproveByAboveallId(aboveallId);
|
|
TPssrApprove exist = tPssrApproveService.selectTPssrApproveByAboveallId(aboveallId);
|
|
@@ -2603,6 +2606,7 @@ public class TPssrApproveController extends BaseController {
|
|
Map<String, Object> variables = new HashMap<>();
|
|
Map<String, Object> variables = new HashMap<>();
|
|
variables.put("applyUser", userId);
|
|
variables.put("applyUser", userId);
|
|
variables.put("confirmUsers", confirmUsers);
|
|
variables.put("confirmUsers", confirmUsers);
|
|
|
|
+ variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
|
|
variables.put("chargePerson", confirm);
|
|
variables.put("chargePerson", confirm);
|
|
//采用key来启动流程定义并设置流程变量,返回流程实例
|
|
//采用key来启动流程定义并设置流程变量,返回流程实例
|
|
ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
|
|
ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
|
|
@@ -2624,6 +2628,7 @@ public class TPssrApproveController extends BaseController {
|
|
variables.put("applyUser", userId);
|
|
variables.put("applyUser", userId);
|
|
variables.put("confirmUsers1", confirmUsers1);
|
|
variables.put("confirmUsers1", confirmUsers1);
|
|
variables.put("confirmUsers2", confirmUsers2);
|
|
variables.put("confirmUsers2", confirmUsers2);
|
|
|
|
+ variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
|
|
variables.put("chargePerson", confirm);
|
|
variables.put("chargePerson", confirm);
|
|
//采用key来启动流程定义并设置流程变量,返回流程实例
|
|
//采用key来启动流程定义并设置流程变量,返回流程实例
|
|
ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
|
|
ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
|
|
@@ -2646,6 +2651,7 @@ public class TPssrApproveController extends BaseController {
|
|
variables.put("confirmUsers1", confirmUsers1);
|
|
variables.put("confirmUsers1", confirmUsers1);
|
|
variables.put("confirmUsers2", confirmUsers2);
|
|
variables.put("confirmUsers2", confirmUsers2);
|
|
variables.put("confirmUsers3", confirmUsers3);
|
|
variables.put("confirmUsers3", confirmUsers3);
|
|
|
|
+ variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
|
|
variables.put("chargePerson", confirm);
|
|
variables.put("chargePerson", confirm);
|
|
//采用key来启动流程定义并设置流程变量,返回流程实例
|
|
//采用key来启动流程定义并设置流程变量,返回流程实例
|
|
ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr3confirm", String.valueOf(businessKey), variables);
|
|
ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr3confirm", String.valueOf(businessKey), variables);
|