试样订单:跟踪单-导出

@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
+import com.lframework.xingyun.sc.vo.sample.tracking.CreateSampleResultTrackingVo;
 import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleFeedbackTrackingDetailVo;
 import com.lframework.xingyun.sc.vo.sample.tracking.QuerySampleResultTrackingVo;
 import com.lframework.xingyun.sc.service.sample.SampleResultTrackingService;
@@ -15,7 +16,9 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.annotation.Resource;
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.*;
 import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.sc.vo.sample.tracking.UpdateSampleResultTrackingVo;
 import io.swagger.annotations.ApiImplicitParam;
@@ -27,21 +30,25 @@ import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.scilab.forge.jlatexmath.TeXConstants;
+import org.scilab.forge.jlatexmath.TeXFormula;
+import org.scilab.forge.jlatexmath.TeXIcon;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.awt.*;
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.*;
 import java.net.URLEncoder;
 import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -99,6 +106,19 @@ public class SampleResultTrackingController extends DefaultBaseController {
     }
 
     /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"sample:tracking:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid @RequestBody CreateSampleResultTrackingVo vo) {
+
+        sampleResultTrackingService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 修改
      */
     @ApiOperation("修改")
@@ -139,7 +159,7 @@ public class SampleResultTrackingController extends DefaultBaseController {
 
         try {
             // 加载模板文件
-            ClassPathResource templateResource = new ClassPathResource("templates/confirmationSlipTemplate.xlsx");
+            ClassPathResource templateResource = new ClassPathResource("templates/resultTrackingTemplate.xlsx");
             try (InputStream inputStream = templateResource.getStream();
                  Workbook workbook = new XSSFWorkbook(inputStream)) {
                 try {
@@ -179,7 +199,7 @@ public class SampleResultTrackingController extends DefaultBaseController {
 
                             String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
                             if (StringUtils.isNotBlank(latex)) {
-                                LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 2, 3);
+                                LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 2, 1, 2);
                             }
 
                             ExcelUtil.setCellValue(sheet, startRow, 4, detail.getStatus());
@@ -194,7 +214,7 @@ public class SampleResultTrackingController extends DefaultBaseController {
                     dataMap.put("customerName", data.getCustomerName() == null ? "" : data.getCustomerName());
                     dataMap.put("workshopName", data.getWorkshopName() == null ? "" : data.getWorkshopName());
                     dataMap.put("orderCode", data.getOrderCode() == null ? "" : data.getOrderCode());
-                    dataMap.put("surface", data.getWorkshopName() == null ? "" : data.getWorkshopName());
+                    dataMap.put("surface", data.getSurface() == null ? "" : data.getSurface());
                     dataMap.put("performance", data.getPerformance() == null ? "" : data.getPerformance());
                     dataMap.put("tolerance", data.getTolerance() == null ? "" : data.getTolerance());
                     dataMap.put("bandingPattern", data.getBandingPattern() == null ? "" : data.getBandingPattern());
@@ -222,9 +242,9 @@ public class SampleResultTrackingController extends DefaultBaseController {
                 }
 
             } catch (FileNotFoundException e) {
-                throw new RuntimeException("模板文件不存在: templates/confirmationSlipTemplate.xlsx", e);
+                throw new RuntimeException("模板文件不存在: templates/resultTrackingTemplate.xlsx", e);
             } catch (IOException e) {
-                throw new RuntimeException("无法读取模板文件: templates/confirmationSlipTemplate.xlsx", e);
+                throw new RuntimeException("无法读取模板文件: templates/resultTrackingTemplate.xlsx", e);
             }
         } catch (Exception e) {
             log.error("产品试样结果跟踪单打印: {}", e.getMessage(), e);

@@ -53,7 +53,7 @@ public class CreateSampleResultTrackingVo implements BaseVo, Serializable {
     /**
      * 明细数据
      */
-    @ApiModelProperty("客户ID")
+    @ApiModelProperty("明细数据")
     private List<SampleFeedbackTrackingDetail> sampleFeedbackTrackingDetailList;
 
 }

@@ -70,7 +70,7 @@
             tb.create_by_id,
             tb.update_by_id,
             tb.create_time,
-            tb.update_time,
+            tb.update_time
         FROM sample_result_tracking AS tb
         left join base_data_customer as cu on cu.id = tb.customer_id
         left join base_data_workshop as ws on ws.id = tb.workshop_id