PSSR功能优化及邮件通知

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -541,6 +541,7 @@ public class TPssrApproveController extends BaseController {
                 torchvoc.setSubId(dto.getSubId());
                 torchvoc.setIds(dto.getIds());
                 torchvoc.setTaskType(dto.getTaskType());
+                torchvoc.setTorchvocType(dto.getTorchvocType());
                 return torchvocController.confirmTorchvoc(torchvoc);
             case "yfl"://原辅料
                 switch (dto.getSubName()) {
@@ -627,6 +628,7 @@ public class TPssrApproveController extends BaseController {
                 lighting.setSubId(dto.getSubId());
                 lighting.setIds(dto.getIds());
                 lighting.setTaskType(dto.getTaskType());
+                lighting.setLightingType(dto.getLightingType());
                 return lightingController.Lighting(lighting);
             case "jdjdkj"://静电接地、跨接
                 TPssrFranklinism franklinism = new TPssrFranklinism();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -9,6 +9,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrMaterialMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -442,6 +443,7 @@ public class TPssrMaterialController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmerUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialRawController.java

@@ -7,6 +7,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrMaterialRaw;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
@@ -256,6 +257,7 @@ public class TPssrMaterialRawController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmerUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrMeasureMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -452,6 +453,7 @@ public class TPssrMeasureController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
@@ -349,6 +350,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrOverhaulFilterMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -220,6 +221,7 @@ public class TPssrOverhaulFilterController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java

@@ -7,6 +7,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrOverhaulPipeMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -116,6 +117,7 @@ public class TPssrOverhaulPipeController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java

@@ -7,6 +7,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrOverhaulPumpMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -117,6 +118,7 @@ public class TPssrOverhaulPumpController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrOverhaulTowerMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -213,6 +214,7 @@ public class TPssrOverhaulTowerController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrOverhaulValveMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -222,6 +223,7 @@ public class TPssrOverhaulValveController extends BaseController {
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
             variables.put("confirmUsers", new ArrayList<>(confirmUsers1));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPipe;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
@@ -411,6 +412,7 @@ public class TPssrPipeController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrProtection;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
@@ -433,6 +434,7 @@ public class TPssrProtectionController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", confirmUsers1);
             variables.put("confirmUsers2", confirmUsers2);
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrPumpCleaningMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -452,6 +453,7 @@ public class TPssrPumpCleaningController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPumpFill;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
@@ -454,6 +455,7 @@ public class TPssrPumpFillController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrPumpOverhaulMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -449,6 +450,7 @@ public class TPssrPumpOverhaulController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyController.java

@@ -5,6 +5,7 @@ import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
@@ -482,6 +483,7 @@ public class TPssrSafetyController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
@@ -572,6 +574,7 @@ public class TPssrSafetyController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
@@ -662,6 +665,7 @@ public class TPssrSafetyController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
@@ -752,6 +756,7 @@ public class TPssrSafetyController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
@@ -842,6 +847,7 @@ public class TPssrSafetyController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrVesselMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -406,6 +407,7 @@ public class TPssrVesselController extends BaseController {
             variables.put("applyUser", userId);
             variables.put("confirmUsers1", new ArrayList<>(confirmerUsers1));
             variables.put("confirmUsers2", new ArrayList<>(confirmerUsers2));
+            variables.put("confirmTaskCreateListener", new ConfirmTaskCreateListener());//发送邮件
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/domain/dto/TPssrApproveDto.java

@@ -15,6 +15,26 @@ public class TPssrApproveDto {
 
     private String reason;
 
+    private String torchvocType;
+
+    private String lightingType;
+
+    public String getTorchvocType() {
+        return torchvocType;
+    }
+
+    public void setTorchvocType(String torchvocType) {
+        this.torchvocType = torchvocType;
+    }
+
+    public String getLightingType() {
+        return lightingType;
+    }
+
+    public void setLightingType(String lightingType) {
+        this.lightingType = lightingType;
+    }
+
     private List<TPssrApproveDto> dataList;
 
     public Long getId() {