Kaynağa Gözat

张丁 生成预约作业票测试2.0

zhangding 3 yıl önce
ebeveyn
işleme
8144d379ee

+ 2 - 7
master/src/main/java/com/ruoyi/project/listener/invoiceApprove/InvoiceEndSuccessListener.java

@@ -52,11 +52,6 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
         IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
         TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
-
-        // 修改申请状态
-        TInvoiceBookingworkticket invoiceBook = tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(Long.valueOf(approveEntity.getInvoiceId()));
-        invoiceBook.setStatus(3L);
-        tInvoiceBookingworkticketService.updateById(invoiceBook);
         //发送邮件
         try {
             String email = sysUserService.selectUserById(approveEntity.getUserId()).getEmail();
@@ -159,7 +154,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
         Map<String, Object> params = new HashMap<>();
         ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
-        ISysDictTypeService iSysDictTypeService = (ISysDictTypeService) SpringContextUtils.getBean("iSysDictTypeService");
+        ISysDictTypeService iSysDictTypeService = (ISysDictTypeService) SpringContextUtils.getBean("sysDictTypeService");
         ITInvoiceBookingworkticketService tInvoiceBookingworkticketService = (ITInvoiceBookingworkticketService) SpringContextUtils.getBean("tInvoiceBookingworkticketService");
         List<TInvoiceWorkcontent> tInvoiceWorkcontentList= tInvoiceBookingworkticketService.selectTInvoiceWorkcontentBybookingticketId(ticket.getId());
         //字典查询
@@ -240,7 +235,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
             }
             //申请单编号
             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) {

+ 1 - 0
master/src/main/java/com/ruoyi/project/system/service/ISysUserService.java

@@ -11,6 +11,7 @@ import com.ruoyi.project.system.domain.SysUserRole;
  *
  * @author ruoyi
  */
+
 public interface ISysUserService
 {
     /**