LY 预约票 bugfix

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

@@ -47,7 +47,7 @@ import java.util.*;
  * @author ruoyi
  * @date 2022-08-25
  */
-@RestController
+@RestController("tInvoiceBookingworkticketController")
 @RequestMapping("/invoice/bookingworkticket")
 public class TInvoiceBookingworkticketController extends BaseController
 {

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -24,13 +25,13 @@ import java.util.List;
 @Service("tInvoiceBookingworkticketService")
 public class TInvoiceBookingworkticketServiceImpl extends ServiceImpl<TInvoiceBookingworkticketMapper, TInvoiceBookingworkticket>  implements ITInvoiceBookingworkticketService
 {
-    @Autowired
+    @Resource
     private TInvoiceBookingworkticketMapper tInvoiceBookingworkticketMapper;
 
-    @Autowired
+    @Resource
     private TInvoiceContractorMapper tInvoiceContractorMapper;
 
-    @Autowired
+    @Resource
     private TInvoiceWorkcontentMapper tInvoiceWorkcontentMapper;
 
     /**

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

@@ -12,6 +12,7 @@ import com.ruoyi.common.utils.SpringContextUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.project.invoice.controller.TInvoiceBookingworkticketController;
 import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
 import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
 import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
@@ -48,6 +49,8 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
         logger.info("审批id--------------------------------" + id);
         ITApproveReserveInvoiceService tApproveReserveInvoiceService = (ITApproveReserveInvoiceService) SpringContextUtils.getBean("tApproveReserveInvoiceService");
         ITInvoiceBookingworkticketService tInvoiceBookingworkticketService = (ITInvoiceBookingworkticketService) SpringContextUtils.getBean("tInvoiceBookingworkticketService");
+        TInvoiceBookingworkticketController bookingworkticketController = (TInvoiceBookingworkticketController) SpringContextUtils.getBean("tInvoiceBookingworkticketController");
+
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
         IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
         TApproveReserveInvoice approveEntity = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(id)) ;
@@ -111,7 +114,7 @@ public class InvoiceEndSuccessListener implements Serializable, ExecutionListene
         //生成预约票
         String url= null;
         try {
-            url = PreView(Long.parseLong(approveEntity.getInvoiceId()));
+            url = bookingworkticketController.PreView(Long.parseLong(approveEntity.getInvoiceId()));
         } catch (IOException e) {
             e.printStackTrace();
         }