|
@@ -52,11 +52,6 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
|
|
ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
|
|
ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
|
|
IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
|
|
IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
|
|
TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
|
|
TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
|
|
-
|
|
|
|
- // 修改申请状态
|
|
|
|
- TInvoiceBookingworkticket invoiceBook = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(Long.valueOf(approveEntity.getInvoiceId()));
|
|
|
|
- invoiceBook.setStatus(3L);
|
|
|
|
- tInvoiceBookingworkticketService.updateById(invoiceBook);
|
|
|
|
//发送邮件
|
|
//发送邮件
|
|
try {
|
|
try {
|
|
String email = sysUserService.selectUserById(approveEntity.getUserId()).getEmail();
|
|
String email = sysUserService.selectUserById(approveEntity.getUserId()).getEmail();
|
|
@@ -159,7 +154,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
|
|
ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
|
|
ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
|
|
ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
|
|
- ISysDictTypeService iSysDictTypeService = (ISysDictTypeService) SpringContextUtils.getBean("iSysDictTypeService");
|
|
|
|
|
|
+ ISysDictTypeService iSysDictTypeService = (ISysDictTypeService) SpringContextUtils.getBean("sysDictTypeService");
|
|
ITInvoiceBookingworkticketService tInvoiceBookingworkticketService = (ITInvoiceBookingworkticketService) SpringContextUtils.getBean("tInvoiceBookingworkticketService");
|
|
ITInvoiceBookingworkticketService tInvoiceBookingworkticketService = (ITInvoiceBookingworkticketService) SpringContextUtils.getBean("tInvoiceBookingworkticketService");
|
|
List<TInvoiceWorkcontent> tInvoiceWorkcontentList= tInvoiceBookingworkticketService.selectTInvoiceWorkcontentBybookingticketId(ticket.getId());
|
|
List<TInvoiceWorkcontent> tInvoiceWorkcontentList= tInvoiceBookingworkticketService.selectTInvoiceWorkcontentBybookingticketId(ticket.getId());
|
|
//字典查询
|
|
//字典查询
|
|
@@ -240,7 +235,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
|
|
}
|
|
}
|
|
//申请单编号
|
|
//申请单编号
|
|
if (!params.containsKey("application")) {
|
|
if (!params.containsKey("application")) {
|
|
- params.put("application"+i, Texts.of(DateUtils.dateTimeNow()).fontSize(10).bold().create());
|
|
|
|
|
|
+ params.put("application", Texts.of(DateUtils.dateTimeNow()).fontSize(10).bold().create());
|
|
}
|
|
}
|
|
//暂定的批准日期
|
|
//暂定的批准日期
|
|
if(tApproveReserveInvoice.getEnddate()!=null) {
|
|
if(tApproveReserveInvoice.getEnddate()!=null) {
|