预约开票申请流程监听，装置区域管理模块

master/src/main/java/com/ruoyi/project/invoice/controller/TApproveReserveInvoiceController.java

@@ -14,6 +14,7 @@ import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
 import com.ruoyi.project.invoice.mapper.TInvoiceWorkcontentMapper;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
+import com.ruoyi.project.listener.invoiceApprove.*;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RuntimeService;
@@ -126,11 +127,17 @@ public class TApproveReserveInvoiceController extends BaseController {
         variables.put("applyUser", userid.toString());
         variables.put("yhzgusers", tApproveReserveInvoice.getUserSupId());//用户主管
         variables.put("zzzgusers", tApproveReserveInvoice.getDevSupId());//装置主管
-        if ("1".equals(tApproveReserveInvoice.getIsToday()))
+        if ("1".equals(tApproveReserveInvoice.getIsToday())) {
             variables.put("zzgcsusers", tApproveReserveInvoice.getDevEngineerId());//装置工程师
-        if ("1".equals(tApproveReserveInvoice.getIsSpecial()))
+            variables.put("zzgcsTaskCreateListener",new ZzgcsTaskCreateListener());//装置工程师监听发送邮件
+        }
+        if ("1".equals(tApproveReserveInvoice.getIsSpecial())) {
             variables.put("zzjlusers", tApproveReserveInvoice.getManagerconId());//装置经理
-        variables.put("bzusers", tApproveReserveInvoice.getMonitorId());//装置经理
+            variables.put("zzjlTaskCreateListener",new ZzjlTaskCreateListener());//装置经理监听发送邮件
+        }
+        variables.put("yhzgTaskCreateListener",new YhzgTaskCreateListener());//用户主管监听发送邮件
+        variables.put("zzzgTaskCreateListener",new ZzzgTaskCreateListener());//装置主管监听发送邮件
+        variables.put("invoiceEndSuccessListener",new InvoiceEndSuccessListener());//流程结束监听发送邮件
         //采用key来启动流程定义并设置流程变量，返回流程实例
         ProcessInstance pi = runtimeService.startProcessInstanceByKey("reserveInvoice", String.valueOf(bussniseeKey), variables);
         logger.info("流程部署id：" + pi.getDeploymentId());

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceDeviceController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.project.invoice.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.invoice.domain.TInvoiceDevice;
+import com.ruoyi.project.invoice.service.ITInvoiceDeviceService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 装置区域管理Controller
+ *
+ * @author ruoyi
+ * @date 2022-09-06
+ */
+@RestController
+@RequestMapping("/invoice/device")
+public class TInvoiceDeviceController extends BaseController
+{
+    @Autowired
+    private ITInvoiceDeviceService tInvoiceDeviceService;
+
+    /**
+     * 查询装置区域管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:device:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TInvoiceDevice tInvoiceDevice)
+    {
+        startPage();
+        List<TInvoiceDevice> list = tInvoiceDeviceService.selectTInvoiceDeviceList(tInvoiceDevice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出装置区域管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:device:export')")
+    @Log(title = "装置区域管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TInvoiceDevice tInvoiceDevice)
+    {
+        List<TInvoiceDevice> list = tInvoiceDeviceService.selectTInvoiceDeviceList(tInvoiceDevice);
+        ExcelUtil<TInvoiceDevice> util = new ExcelUtil<TInvoiceDevice>(TInvoiceDevice.class);
+        return util.exportExcel(list, "device");
+    }
+
+    /**
+     * 获取装置区域管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:device:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tInvoiceDeviceService.selectTInvoiceDeviceById(id));
+    }
+
+    /**
+     * 新增装置区域管理
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:device:add')")
+    @Log(title = "装置区域管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TInvoiceDevice tInvoiceDevice)
+    {
+        return toAjax(tInvoiceDeviceService.insertTInvoiceDevice(tInvoiceDevice));
+    }
+
+    /**
+     * 修改装置区域管理
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:device:edit')")
+    @Log(title = "装置区域管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TInvoiceDevice tInvoiceDevice)
+    {
+        return toAjax(tInvoiceDeviceService.updateTInvoiceDevice(tInvoiceDevice));
+    }
+
+    /**
+     * 删除装置区域管理
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:device:remove')")
+    @Log(title = "装置区域管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tInvoiceDeviceService.deleteTInvoiceDeviceByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceDevice.java

@@ -0,0 +1,180 @@
+package com.ruoyi.project.invoice.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 装置区域管理对象 t_invoice_device
+ *
+ * @author ruoyi
+ * @date 2022-09-06
+ */
+public class TInvoiceDevice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 装置名称 */
+    @Excel(name = "装置名称")
+    private String devName;
+
+    /** 工作区域 */
+    @Excel(name = "工作区域")
+    private String workArea;
+
+    /** 区域负责人 */
+    @Excel(name = "区域负责人")
+    private String regionalHead;
+
+    /** 状态 0 ：正常 ；-1：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDevName(String devName)
+    {
+        this.devName = devName;
+    }
+
+    public String getDevName()
+    {
+        return devName;
+    }
+    public void setWorkArea(String workArea)
+    {
+        this.workArea = workArea;
+    }
+
+    public String getWorkArea()
+    {
+        return workArea;
+    }
+    public void setRegionalHead(String regionalHead)
+    {
+        this.regionalHead = regionalHead;
+    }
+
+    public String getRegionalHead()
+    {
+        return regionalHead;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("devName", getDevName())
+            .append("workArea", getWorkArea())
+            .append("regionalHead", getRegionalHead())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/invoice/mapper/TInvoiceDeviceMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.invoice.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.invoice.domain.TInvoiceDevice;
+
+/**
+ * 装置区域管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-09-06
+ */
+public interface TInvoiceDeviceMapper 
+{
+    /**
+     * 查询装置区域管理
+     * 
+     * @param id 装置区域管理ID
+     * @return 装置区域管理
+     */
+    public TInvoiceDevice selectTInvoiceDeviceById(Long id);
+
+    /**
+     * 查询装置区域管理列表
+     * 
+     * @param tInvoiceDevice 装置区域管理
+     * @return 装置区域管理集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TInvoiceDevice> selectTInvoiceDeviceList(TInvoiceDevice tInvoiceDevice);
+
+    /**
+     * 新增装置区域管理
+     * 
+     * @param tInvoiceDevice 装置区域管理
+     * @return 结果
+     */
+    public int insertTInvoiceDevice(TInvoiceDevice tInvoiceDevice);
+
+    /**
+     * 修改装置区域管理
+     * 
+     * @param tInvoiceDevice 装置区域管理
+     * @return 结果
+     */
+    public int updateTInvoiceDevice(TInvoiceDevice tInvoiceDevice);
+
+    /**
+     * 删除装置区域管理
+     * 
+     * @param id 装置区域管理ID
+     * @return 结果
+     */
+    public int deleteTInvoiceDeviceById(Long id);
+
+    /**
+     * 批量删除装置区域管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTInvoiceDeviceByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/invoice/service/ITInvoiceDeviceService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.invoice.service;
+
+import java.util.List;
+import com.ruoyi.project.invoice.domain.TInvoiceDevice;
+
+/**
+ * 装置区域管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-09-06
+ */
+public interface ITInvoiceDeviceService 
+{
+    /**
+     * 查询装置区域管理
+     * 
+     * @param id 装置区域管理ID
+     * @return 装置区域管理
+     */
+    public TInvoiceDevice selectTInvoiceDeviceById(Long id);
+
+    /**
+     * 查询装置区域管理列表
+     * 
+     * @param tInvoiceDevice 装置区域管理
+     * @return 装置区域管理集合
+     */
+    public List<TInvoiceDevice> selectTInvoiceDeviceList(TInvoiceDevice tInvoiceDevice);
+
+    /**
+     * 新增装置区域管理
+     * 
+     * @param tInvoiceDevice 装置区域管理
+     * @return 结果
+     */
+    public int insertTInvoiceDevice(TInvoiceDevice tInvoiceDevice);
+
+    /**
+     * 修改装置区域管理
+     * 
+     * @param tInvoiceDevice 装置区域管理
+     * @return 结果
+     */
+    public int updateTInvoiceDevice(TInvoiceDevice tInvoiceDevice);
+
+    /**
+     * 批量删除装置区域管理
+     * 
+     * @param ids 需要删除的装置区域管理ID
+     * @return 结果
+     */
+    public int deleteTInvoiceDeviceByIds(Long[] ids);
+
+    /**
+     * 删除装置区域管理信息
+     * 
+     * @param id 装置区域管理ID
+     * @return 结果
+     */
+    public int deleteTInvoiceDeviceById(Long id);
+}

master/src/main/java/com/ruoyi/project/invoice/service/impl/TApproveReserveInvoiceServiceImpl.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2022-08-29
  */
-@Service
+@Service("tApproveReserveInvoiceService")
 public class TApproveReserveInvoiceServiceImpl implements ITApproveReserveInvoiceService
 {
     @Autowired

master/src/main/java/com/ruoyi/project/invoice/service/impl/TInvoiceDeviceServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.invoice.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.invoice.mapper.TInvoiceDeviceMapper;
+import com.ruoyi.project.invoice.domain.TInvoiceDevice;
+import com.ruoyi.project.invoice.service.ITInvoiceDeviceService;
+
+/**
+ * 装置区域管理Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-09-06
+ */
+@Service
+public class TInvoiceDeviceServiceImpl implements ITInvoiceDeviceService
+{
+    @Autowired
+    private TInvoiceDeviceMapper tInvoiceDeviceMapper;
+
+    /**
+     * 查询装置区域管理
+     *
+     * @param id 装置区域管理ID
+     * @return 装置区域管理
+     */
+    @Override
+    public TInvoiceDevice selectTInvoiceDeviceById(Long id)
+    {
+        return tInvoiceDeviceMapper.selectTInvoiceDeviceById(id);
+    }
+
+    /**
+     * 查询装置区域管理列表
+     *
+     * @param tInvoiceDevice 装置区域管理
+     * @return 装置区域管理
+     */
+    @Override
+    public List<TInvoiceDevice> selectTInvoiceDeviceList(TInvoiceDevice tInvoiceDevice)
+    {
+        return tInvoiceDeviceMapper.selectTInvoiceDeviceList(tInvoiceDevice);
+    }
+
+    /**
+     * 新增装置区域管理
+     *
+     * @param tInvoiceDevice 装置区域管理
+     * @return 结果
+     */
+    @Override
+    public int insertTInvoiceDevice(TInvoiceDevice tInvoiceDevice)
+    {
+        return tInvoiceDeviceMapper.insertTInvoiceDevice(tInvoiceDevice);
+    }
+
+    /**
+     * 修改装置区域管理
+     *
+     * @param tInvoiceDevice 装置区域管理
+     * @return 结果
+     */
+    @Override
+    public int updateTInvoiceDevice(TInvoiceDevice tInvoiceDevice)
+    {
+        return tInvoiceDeviceMapper.updateTInvoiceDevice(tInvoiceDevice);
+    }
+
+    /**
+     * 批量删除装置区域管理
+     *
+     * @param ids 需要删除的装置区域管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInvoiceDeviceByIds(Long[] ids)
+    {
+        return tInvoiceDeviceMapper.deleteTInvoiceDeviceByIds(ids);
+    }
+
+    /**
+     * 删除装置区域管理信息
+     *
+     * @param id 装置区域管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInvoiceDeviceById(Long id)
+    {
+        return tInvoiceDeviceMapper.deleteTInvoiceDeviceById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -0,0 +1,82 @@
+package com.ruoyi.project.listener.invoiceApprove;
+
+import com.alibaba.fastjson.JSON;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.ruoyi.common.sendEmail.IMailService;
+import com.ruoyi.common.utils.SpringContextUtils;
+import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
+import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Service("invoiceEndSuccessListener")
+public class InvoiceEndSuccessListener implements Serializable, ExecutionListener {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+        String id = delegateExecution.getProcessInstanceBusinessKey();
+        logger.info("delegateExecution--------------------------------" + delegateExecution);
+        logger.info("审批id--------------------------------" + id);
+        ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
+        ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
+        IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
+        TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
+        //发送邮件
+        try {
+            String email = sysUserService.selectUserById(approveEntity.getUserId()).getEmail();
+            String apNo = approveEntity.getApNo();
+            logger.info("apNo:" + apNo);
+            String username = sysUserService.selectUserById(approveEntity.getUserId()).getNickName();
+            String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
+            logger.info("email:" + email);
+            logger.info("username:" + username);
+            //写html开始内容
+            String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
+                    "<table cellpadding=\"0\" align=\"center\"" +
+                    "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
+                    "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
+                    "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">预约开票管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">Special Equipment Management System (SEMS)</font></th></tr>";
+            //表html中间内容
+            String prime = "";
+            String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
+                    "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN</font></font></h2>" +
+                    "<p>您的审批已完成<br>" +
+                    "You have a new to-do task:<br>" +
+                    "任务编号：<b>apNo</b><br>" +
+                    "Task Number: <b>apNoEN</b><br>" +
+                    "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">预约开票申请流程</a>查看。<br>" +
+                    "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">InvoiceApprove</a> to handle it.</p>" +
+                    "<p align=\"right\">date</p>" +
+                    "<div style=\"width:700px;margin:0 auto;\">" +
+                    "<div style=\"padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;\">" +
+                    "<p>此为系统邮件，请勿回复<br>This e-Mail is an automatic reminder sent by SEMS, please do not reply</p>" +
+                    "</div></div></div></td></tr>";
+            String one = center.replaceFirst("username", username);
+            String two = one.replaceFirst("usernameEN", usernameEN);
+            String four = two.replaceFirst("apNo", apNo);
+            String five = four.replaceFirst("apNoEN", apNo);
+            String result = five.replaceFirst("date", String.valueOf(new Date()));
+            prime = prime + result;
+            //写html结尾内容
+            String end = "</tbody></table></div></body></html>";
+            //拼接html
+            String html = start + prime + end;
+            logger.info("html:" + html);
+            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 SEMS:You have a new to-do task (" + apNo + ")", html);
+        }catch (Exception e) {
+            logger.error("邮件发送失败" + JSON.toJSONString(e));
+        }
+    }
+}

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/YhzgTaskCreateListener.java

@@ -0,0 +1,82 @@
+package com.ruoyi.project.listener.invoiceApprove;
+
+import com.alibaba.fastjson.JSON;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.ruoyi.common.sendEmail.IMailService;
+import com.ruoyi.common.utils.SpringContextUtils;
+import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
+import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Service("yhzgTaskCreateListener")
+public class YhzgTaskCreateListener implements Serializable, TaskListener {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        String yhzgusers = (String) delegateTask.getVariables().get("yhzgusers");
+        String id = delegateTask.getExecution().getProcessInstanceBusinessKey();
+        ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
+        ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
+        IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
+        TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
+        logger.info("approveEntity:" + approveEntity);
+        //发送邮件
+        try {
+            String email = sysUserService.selectUserById(Long.parseLong(yhzgusers)).getEmail();
+            String apNo = approveEntity.getApNo();
+            logger.info("apNo:" + apNo);
+            String username = sysUserService.selectUserById(Long.parseLong(yhzgusers)).getNickName();
+            String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
+            logger.info("email:" + email);
+            logger.info("username:" + username);
+            //写html开始内容
+            String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
+                    "<table cellpadding=\"0\" align=\"center\"" +
+                    "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
+                    "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
+                    "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">预约开票管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">Special Equipment Management System (SEMS)</font></th></tr>";
+            //表html中间内容
+            String prime = "";
+            String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
+                    "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN</font></font></h2>" +
+                    "<p>您有一个新的待办任务：<br>" +
+                    "You have a new to-do task:<br>" +
+                    "任务编号：<b>apNo</b><br>" +
+                    "Task Number: <b>apNoEN</b><br>" +
+                    "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">预约开票申请流程</a>查看。<br>" +
+                    "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">InvoiceApprove</a> to handle it.</p>" +
+                    "<p align=\"right\">date</p>" +
+                    "<div style=\"width:700px;margin:0 auto;\">" +
+                    "<div style=\"padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;\">" +
+                    "<p>此为系统邮件，请勿回复<br>This e-Mail is an automatic reminder sent by SEMS, please do not reply</p>" +
+                    "</div></div></div></td></tr>";
+            String one = center.replaceFirst("username", username);
+            String two = one.replaceFirst("usernameEN", usernameEN);
+            String four = two.replaceFirst("apNo", apNo);
+            String five = four.replaceFirst("apNoEN", apNo);
+            String result = five.replaceFirst("date", String.valueOf(new Date()));
+            prime = prime + result;
+            //写html结尾内容
+            String end = "</tbody></table></div></body></html>";
+            //拼接html
+            String html = start + prime + end;
+            logger.info("html:" + html);
+            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 SEMS:You have a new to-do task (" + apNo + ")", html);
+        }catch (Exception e) {
+            logger.error("邮件发送失败" + JSON.toJSONString(e));
+        }
+    }
+
+}

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzgcsTaskCreateListener.java

@@ -0,0 +1,82 @@
+package com.ruoyi.project.listener.invoiceApprove;
+
+import com.alibaba.fastjson.JSON;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.ruoyi.common.sendEmail.IMailService;
+import com.ruoyi.common.utils.SpringContextUtils;
+import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
+import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Service("zzgcsTaskCreateListener")
+public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        String zzgcsusers = (String) delegateTask.getVariables().get("zzgcsusers");
+        String id = delegateTask.getExecution().getProcessInstanceBusinessKey();
+        ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
+        ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
+        IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
+        TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
+        logger.info("approveEntity:" + approveEntity);
+        //发送邮件
+        try {
+            String email = sysUserService.selectUserById(Long.parseLong(zzgcsusers)).getEmail();
+            String apNo = approveEntity.getApNo();
+            logger.info("apNo:" + apNo);
+            String username = sysUserService.selectUserById(Long.parseLong(zzgcsusers)).getNickName();
+            String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
+            logger.info("email:" + email);
+            logger.info("username:" + username);
+            //写html开始内容
+            String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
+                    "<table cellpadding=\"0\" align=\"center\"" +
+                    "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
+                    "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
+                    "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">预约开票管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">Special Equipment Management System (SEMS)</font></th></tr>";
+            //表html中间内容
+            String prime = "";
+            String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
+                    "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN</font></font></h2>" +
+                    "<p>您有一个新的待办任务：<br>" +
+                    "You have a new to-do task:<br>" +
+                    "任务编号：<b>apNo</b><br>" +
+                    "Task Number: <b>apNoEN</b><br>" +
+                    "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">预约开票申请流程</a>查看。<br>" +
+                    "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">InvoiceApprove</a> to handle it.</p>" +
+                    "<p align=\"right\">date</p>" +
+                    "<div style=\"width:700px;margin:0 auto;\">" +
+                    "<div style=\"padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;\">" +
+                    "<p>此为系统邮件，请勿回复<br>This e-Mail is an automatic reminder sent by SEMS, please do not reply</p>" +
+                    "</div></div></div></td></tr>";
+            String one = center.replaceFirst("username", username);
+            String two = one.replaceFirst("usernameEN", usernameEN);
+            String four = two.replaceFirst("apNo", apNo);
+            String five = four.replaceFirst("apNoEN", apNo);
+            String result = five.replaceFirst("date", String.valueOf(new Date()));
+            prime = prime + result;
+            //写html结尾内容
+            String end = "</tbody></table></div></body></html>";
+            //拼接html
+            String html = start + prime + end;
+            logger.info("html:" + html);
+            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 SEMS:You have a new to-do task (" + apNo + ")", html);
+        }catch (Exception e) {
+            logger.error("邮件发送失败" + JSON.toJSONString(e));
+        }
+    }
+
+}

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzjlTaskCreateListener.java

@@ -0,0 +1,82 @@
+package com.ruoyi.project.listener.invoiceApprove;
+
+import com.alibaba.fastjson.JSON;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.ruoyi.common.sendEmail.IMailService;
+import com.ruoyi.common.utils.SpringContextUtils;
+import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
+import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Service("zzjlTaskCreateListener")
+public class ZzjlTaskCreateListener implements Serializable, TaskListener {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        String zzjlusers = (String) delegateTask.getVariables().get("zzjlusers");
+        String id = delegateTask.getExecution().getProcessInstanceBusinessKey();
+        ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
+        ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
+        IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
+        TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
+        logger.info("approveEntity:" + approveEntity);
+        //发送邮件
+        try {
+            String email = sysUserService.selectUserById(Long.parseLong(zzjlusers)).getEmail();
+            String apNo = approveEntity.getApNo();
+            logger.info("apNo:" + apNo);
+            String username = sysUserService.selectUserById(Long.parseLong(zzjlusers)).getNickName();
+            String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
+            logger.info("email:" + email);
+            logger.info("username:" + username);
+            //写html开始内容
+            String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
+                    "<table cellpadding=\"0\" align=\"center\"" +
+                    "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
+                    "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
+                    "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">预约开票管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">Special Equipment Management System (SEMS)</font></th></tr>";
+            //表html中间内容
+            String prime = "";
+            String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
+                    "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN</font></font></h2>" +
+                    "<p>您有一个新的待办任务：<br>" +
+                    "You have a new to-do task:<br>" +
+                    "任务编号：<b>apNo</b><br>" +
+                    "Task Number: <b>apNoEN</b><br>" +
+                    "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">预约开票申请流程</a>查看。<br>" +
+                    "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">InvoiceApprove</a> to handle it.</p>" +
+                    "<p align=\"right\">date</p>" +
+                    "<div style=\"width:700px;margin:0 auto;\">" +
+                    "<div style=\"padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;\">" +
+                    "<p>此为系统邮件，请勿回复<br>This e-Mail is an automatic reminder sent by SEMS, please do not reply</p>" +
+                    "</div></div></div></td></tr>";
+            String one = center.replaceFirst("username", username);
+            String two = one.replaceFirst("usernameEN", usernameEN);
+            String four = two.replaceFirst("apNo", apNo);
+            String five = four.replaceFirst("apNoEN", apNo);
+            String result = five.replaceFirst("date", String.valueOf(new Date()));
+            prime = prime + result;
+            //写html结尾内容
+            String end = "</tbody></table></div></body></html>";
+            //拼接html
+            String html = start + prime + end;
+            logger.info("html:" + html);
+            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 SEMS:You have a new to-do task (" + apNo + ")", html);
+        }catch (Exception e) {
+            logger.error("邮件发送失败" + JSON.toJSONString(e));
+        }
+    }
+
+}

master/src/main/java/com/ruoyi/project/listener/invoiceApprove/ZzzgTaskCreateListener.java

@@ -0,0 +1,82 @@
+package com.ruoyi.project.listener.invoiceApprove;
+
+import com.alibaba.fastjson.JSON;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import com.ruoyi.common.sendEmail.IMailService;
+import com.ruoyi.common.utils.SpringContextUtils;
+import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
+import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
+import com.ruoyi.project.system.service.ISysUserService;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Service("zzzgTaskCreateListener")
+public class ZzzgTaskCreateListener implements Serializable, TaskListener {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        String zzzgusers = (String) delegateTask.getVariables().get("zzzgusers");
+        String id = delegateTask.getExecution().getProcessInstanceBusinessKey();
+        ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
+        ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
+        IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
+        TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
+        logger.info("approveEntity:" + approveEntity);
+        //发送邮件
+        try {
+            String email = sysUserService.selectUserById(Long.parseLong(zzzgusers)).getEmail();
+            String apNo = approveEntity.getApNo();
+            logger.info("apNo:" + apNo);
+            String username = sysUserService.selectUserById(Long.parseLong(zzzgusers)).getNickName();
+            String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
+            logger.info("email:" + email);
+            logger.info("username:" + username);
+            //写html开始内容
+            String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
+                    "<table cellpadding=\"0\" align=\"center\"" +
+                    "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
+                    "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
+                    "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">预约开票管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">Special Equipment Management System (SEMS)</font></th></tr>";
+            //表html中间内容
+            String prime = "";
+            String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
+                    "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "亲爱的 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
+                    "Dear usernameEN</font></font></h2>" +
+                    "<p>您有一个新的待办任务：<br>" +
+                    "You have a new to-do task:<br>" +
+                    "任务编号：<b>apNo</b><br>" +
+                    "Task Number: <b>apNoEN</b><br>" +
+                    "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">预约开票申请流程</a>查看。<br>" +
+                    "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/approve/pending\">InvoiceApprove</a> to handle it.</p>" +
+                    "<p align=\"right\">date</p>" +
+                    "<div style=\"width:700px;margin:0 auto;\">" +
+                    "<div style=\"padding:10px 10px 0;border-top:1px solid #ccc;color:#747474;margin-bottom:20px;line-height:1.3em;font-size:12px;\">" +
+                    "<p>此为系统邮件，请勿回复<br>This e-Mail is an automatic reminder sent by SEMS, please do not reply</p>" +
+                    "</div></div></div></td></tr>";
+            String one = center.replaceFirst("username", username);
+            String two = one.replaceFirst("usernameEN", usernameEN);
+            String four = two.replaceFirst("apNo", apNo);
+            String five = four.replaceFirst("apNoEN", apNo);
+            String result = five.replaceFirst("date", String.valueOf(new Date()));
+            prime = prime + result;
+            //写html结尾内容
+            String end = "</tbody></table></div></body></html>";
+            //拼接html
+            String html = start + prime + end;
+            logger.info("html:" + html);
+            mailService.sendHtmlMail(email, "预约开票：您有一个新的待办任务 SEMS:You have a new to-do task (" + apNo + ")", html);
+        }catch (Exception e) {
+            logger.error("邮件发送失败" + JSON.toJSONString(e));
+        }
+    }
+
+}

master/src/main/resources/mybatis/invoice/TInvoiceDeviceMapper.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.invoice.mapper.TInvoiceDeviceMapper">
+    
+    <resultMap type="TInvoiceDevice" id="TInvoiceDeviceResult">
+        <result property="id"    column="id"    />
+        <result property="devName"    column="dev_name"    />
+        <result property="workArea"    column="work_area"    />
+        <result property="regionalHead"    column="regional_head"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTInvoiceDeviceVo">
+        select d.id, d.dev_name, d.work_area, d.regional_head, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_invoice_device d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTInvoiceDeviceList" parameterType="TInvoiceDevice" resultMap="TInvoiceDeviceResult">
+        <include refid="selectTInvoiceDeviceVo"/>
+        <where>  
+            <if test="devName != null  and devName != ''"> and dev_name like concat(concat('%', #{devName}), '%')</if>
+            <if test="workArea != null  and workArea != ''"> and work_area = #{workArea}</if>
+            <if test="regionalHead != null  and regionalHead != ''"> and regional_head = #{regionalHead}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTInvoiceDeviceById" parameterType="Long" resultMap="TInvoiceDeviceResult">
+        <include refid="selectTInvoiceDeviceVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTInvoiceDevice" parameterType="TInvoiceDevice">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_invoice_device.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_invoice_device
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="devName != null">dev_name,</if>
+            <if test="workArea != null">work_area,</if>
+            <if test="regionalHead != null">regional_head,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="devName != null">#{devName},</if>
+            <if test="workArea != null">#{workArea},</if>
+            <if test="regionalHead != null">#{regionalHead},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTInvoiceDevice" parameterType="TInvoiceDevice">
+        update t_invoice_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="devName != null">dev_name = #{devName},</if>
+            <if test="workArea != null">work_area = #{workArea},</if>
+            <if test="regionalHead != null">regional_head = #{regionalHead},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTInvoiceDeviceById" parameterType="Long">
+        update t_invoice_device set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTInvoiceDeviceByIds" parameterType="String">
+        update t_invoice_device set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/invoice/device.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询装置区域管理列表
+export function listDevice(query) {
+  return request({
+    url: '/invoice/device/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询装置区域管理详细
+export function getDevice(id) {
+  return request({
+    url: '/invoice/device/' + id,
+    method: 'get'
+  })
+}
+
+// 新增装置区域管理
+export function addDevice(data) {
+  return request({
+    url: '/invoice/device',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改装置区域管理
+export function updateDevice(data) {
+  return request({
+    url: '/invoice/device',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除装置区域管理
+export function delDevice(id) {
+  return request({
+    url: '/invoice/device/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出装置区域管理
+export function exportDevice(query) {
+  return request({
+    url: '/invoice/device/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/invoice/device/index.vue

@@ -0,0 +1,465 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="装置名称" prop="devName">
+        <el-input
+          v-model="queryParams.devName"
+          placeholder="请输入装置名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工作区域" prop="workArea">
+        <el-input
+          v-model="queryParams.workArea"
+          placeholder="请输入工作区域"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区域负责人" prop="regionalHead">
+        <el-input
+          v-model="queryParams.regionalHead"
+          placeholder="请输入区域负责人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['invoice:device:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['invoice:device:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['invoice:device:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['invoice:device:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['invoice:device:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="装置名称" align="center" prop="devName" :show-overflow-tooltip="true"/>
+      <el-table-column label="工作区域" align="center" prop="workArea" :show-overflow-tooltip="true"/>
+      <el-table-column label="区域负责人" align="center" prop="regionalHeadName" :show-overflow-tooltip="true"/>
+
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['invoice:device:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['invoice:device:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改装置区域管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="装置名称" prop="devName">
+          <el-input v-model="form.devName" placeholder="请输入装置名称" />
+        </el-form-item>
+        <el-form-item label="工作区域" prop="workArea">
+          <el-input v-model="form.workArea" placeholder="请输入工作区域" />
+        </el-form-item>
+        <el-form-item label="区域负责人" prop="regionalHead">
+          <el-select
+            v-model="form.regionalHead"
+            placeholder="请输入区域负责人"
+            style="width: 100%"
+            filterable
+            multiple
+          >
+            <el-option
+              v-for="dict in principalList"
+              :key="dict.userId"
+              :label="dict.nickName"
+              :value="dict.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDevice, getDevice, delDevice, addDevice, updateDevice, exportDevice, importTemplate} from "@/api/invoice/device";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {listPostUser} from "@/api/system/user";
+
+export default {
+  name: "Device",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 装置区域管理表格数据
+      deviceList: [],
+      principalList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/invoice/device/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        devName: null,
+        workArea: null,
+        regionalHead: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+    listPostUser({
+      postCode: 'wxjl'
+    }).then(response => {
+      this.principalList = response;
+    });
+  },
+  methods: {
+    /** 查询装置区域管理列表 */
+    getList() {
+      let _this = this
+      this.loading = true;
+      listDevice(this.queryParams).then(response => {
+        this.deviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+        this.deviceList.forEach(function (value,key,arr) {
+          var principalName = null;
+          let principal = null;
+          if (value.regionalHead != null) {
+            principal = value.regionalHead.split(",");
+            principal.forEach(function (value, key, arr) {
+              _this.principalList.forEach(function (v, k, arr){
+                if (value==v.userId){
+                  if (key != 0) {
+                    principalName = principalName + ","+v.nickName;
+                  }else if (key == 0) {
+                    principalName = v.nickName;
+                  }
+                }
+                console.log(principalName)
+              })
+            });
+          }
+          _this.deviceList[key].regionalHead = principal;
+          _this.deviceList[key].regionalHeadName = principalName;
+        })
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        devName: null,
+        workArea: null,
+        regionalHead: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加 装置区域管理信息";
+      listPostUser({
+        postCode: 'wxjl'
+      }).then(response => {
+        this.principalList = response;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      listPostUser({
+        postCode: 'wxjl'
+      }).then(response => {
+        this.principalList = response;
+      });
+      getDevice(id).then(response => {
+        this.form = response.data;
+        this.form.regionalHead=this.form.regionalHead.split(",");
+        this.open = true;
+        this.title = "修改装置区域管理";
+      });
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+      let regionalHead = "";
+      this.form.regionalHead.forEach(item =>{
+        regionalHead+=item+",";
+      })
+      this.form.regionalHead=regionalHead.substring(0,regionalHead.length-1);
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDevice(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDevice(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDevice(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有装置区域管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportDevice(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>