20241213

zhaowenxuan

2024-12-13 ec266a0440669bb6b9830991770fa5b0a7568fdf

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java

@@ -392,8 +392,12 @@
                LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
                TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
                LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjReportTemplate::getFlag,"4");
                wrapper.eq(TjReportTemplate::getOpen,"1");
                TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
                try {
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
                } catch (Exception e) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    log.error(String.valueOf(e));
@@ -409,12 +413,13 @@
        return AjaxResult.error();
    }

    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) {
        AjaxResult ajaxResult = null;
        try {
//            ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
//            ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
            ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);

            ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e));