楚江erp：样品反馈单导出样式调整

@@ -119,15 +119,6 @@ public class GetSampleResultFeedbackBo extends BaseBo<SampleResultFeedback> {
 
 
     @Override
     @Override
     protected void afterInit(SampleResultFeedback dto) {
     protected void afterInit(SampleResultFeedback dto) {
-        if (StringUtils.isNotBlank(dto.getCustomerId())) {
-            CustomerService customerService = ApplicationUtil.getBean(CustomerService.class);
-            Customer customer = customerService.findById(dto.getCustomerId());
-            this.customerName = customer == null ? null : customer.getName();
-        }
-        if (StringUtils.isNotBlank(dto.getWorkshopId())) {
-            WorkshopService workshopService = ApplicationUtil.getBean(WorkshopService.class);
-            Workshop workshop = workshopService.findById(dto.getWorkshopId());
-            this.workshopName = workshop == null ? null : workshop.getName();
-        }
+
     }
     }
 }
 }

@@ -176,7 +176,7 @@ public class SampleResultFeedbackController extends DefaultBaseController {
 
 
             ExcelUtil.processTemplate(workbook, dataMap);
             ExcelUtil.processTemplate(workbook, dataMap);
             if ("PDF".equals(exportType)) {
             if ("PDF".equals(exportType)) {
-                ResponseUtil.setPDFResponseHead(response, data.getOrderNo() + "-试样结果反馈单.xlsx");
+                ResponseUtil.setPDFResponseHead(response, data.getOrderNo() + "-试样结果反馈单.pdf");
                 // 输出为PDF文档
                 // 输出为PDF文档
                 // === 写入临时 .xls 文件 ===
                 // === 写入临时 .xls 文件 ===
                 File tempExcel = File.createTempFile("sample_feedback_" + data.getOrderNo(), ".xls");
                 File tempExcel = File.createTempFile("sample_feedback_" + data.getOrderNo(), ".xls");

@@ -2,6 +2,10 @@ package com.lframework.xingyun.sc.impl.sample;
 
 
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.xingyun.basedata.entity.Customer;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.customer.CustomerService;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -38,6 +42,10 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     @Resource
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private WorkshopService workshopService;
 
 
 
 
     @Override
     @Override
@@ -63,6 +71,19 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
         if (sampleResultFeedback != null) {
         if (sampleResultFeedback != null) {
             List<SampleFeedbackTrackingDetail> detailList = sampleFeedbackTrackingDetailService.listByFeedbackIds(Collections.singletonList(id));
             List<SampleFeedbackTrackingDetail> detailList = sampleFeedbackTrackingDetailService.listByFeedbackIds(Collections.singletonList(id));
             sampleResultFeedback.setDetailList(detailList);
             sampleResultFeedback.setDetailList(detailList);
+            // 客户名称
+            String customerId = sampleResultFeedback.getCustomerId();
+            if (StringUtils.isNotBlank(customerId)) {
+                Customer customer = customerService.findById(customerId);
+                sampleResultFeedback.setCustomerName(customer == null ? null : customer.getName());
+            }
+            // 所属厂房
+            String workshopId = sampleResultFeedback.getWorkshopId();
+            if (StringUtils.isNotBlank(workshopId)) {
+                Workshop workshop = workshopService.findById(workshopId);
+                sampleResultFeedback.setWorkshopName(workshop == null ? null : workshop.getName());
+            }
+            // 订单编号
             String orderId = sampleResultFeedback.getOrderId();
             String orderId = sampleResultFeedback.getOrderId();
             if (StringUtils.isNotBlank(orderId)) {
             if (StringUtils.isNotBlank(orderId)) {
                 PurchaseOrderInfo orderInfo = purchaseOrderInfoService.getBaseMapper().selectById(orderId);
                 PurchaseOrderInfo orderInfo = purchaseOrderInfoService.getBaseMapper().selectById(orderId);