|
@@ -9,6 +9,7 @@ import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
|
|
|
import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
|
|
|
import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
|
|
|
import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
|
|
|
+import com.ruoyi.project.system.domain.SysUser;
|
|
|
import com.ruoyi.project.system.service.ISysUserService;
|
|
|
import org.activiti.engine.delegate.DelegateTask;
|
|
|
import org.activiti.engine.delegate.TaskListener;
|
|
@@ -43,7 +44,9 @@ public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
|
|
|
String email = sysUserService.selectUserById(Long.parseLong(zzgcsuser)).getEmail();
|
|
|
String apNo = approveEntity.getApNo();
|
|
|
logger.info("apNo:" + apNo);
|
|
|
- String username = sysUserService.selectUserById(Long.parseLong(zzgcsuser)).getNickName();
|
|
|
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(zzgcsuser));
|
|
|
+ String username = sysUser.getNickName();
|
|
|
+ String loginName = sysUser.getUserName();
|
|
|
String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
|
|
|
logger.info("email:" + email);
|
|
|
logger.info("username:" + username);
|
|
@@ -57,8 +60,8 @@ public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
|
|
|
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>" +
|
|
|
+ "亲爱的 username(loginName)</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
|
|
|
+ "Dear usernameEN(loginName)</font></font></h2>" +
|
|
|
"<p>您有一个新的待办任务:<br>" +
|
|
|
"You have a new to-do task:<br>" +
|
|
|
"任务名:<b>预约开票审批流程:装置工程师签字确认</b><br>" +
|
|
@@ -74,7 +77,8 @@ public class ZzgcsTaskCreateListener implements Serializable, TaskListener {
|
|
|
"</div></div></div></td></tr>";
|
|
|
String one = center.replaceFirst("username", username);
|
|
|
String two = one.replaceFirst("usernameEN", usernameEN);
|
|
|
- String four = two.replaceFirst("apNo", apNo);
|
|
|
+ String three = two.replace("loginName", loginName);
|
|
|
+ String four = three.replaceFirst("apNo", apNo);
|
|
|
String five = four.replaceFirst("apNoEN", apNo);
|
|
|
String result = five.replaceFirst("date", String.valueOf(new Date()));
|
|
|
prime = prime + result;
|