联调修改

src/main/java/net/vtstar/zhongtong/avi/laboratory/controller/DailyCheckController.java

@@ -84,16 +84,16 @@ public class DailyCheckController {
     }
 
     @ApiOperation("删除检测项模板")
-    @DeleteMapping("/deleteCheckItemModelById")
-    public Return deleteCheckItemModelById(@RequestParam("id") Long id) {
+    @DeleteMapping("/deleteCheckItemModelById/{id}")
+    public Return deleteCheckItemModelById(@PathVariable("id") Long id) {
         ParamAssert.notNull(id, "id is null");
         service.deleteCheckItemModelById(id);
         return Return.success();
     }
 
     @ApiOperation("打印")
-    @PostMapping("/expert")
-    public void expert(@RequestParam("recordId") Long recordId, HttpServletResponse response){
+    @PostMapping("/expert/{recordId}")
+    public void expert(@PathVariable("recordId") Long recordId, HttpServletResponse response){
         service.expert(recordId, response);
     }
 }

src/main/java/net/vtstar/zhongtong/avi/laboratory/service/DailyCheckService.java

@@ -7,6 +7,7 @@ import net.vtstar.user.mybatis.provider.Operation;
 import net.vtstar.user.mybatis.provider.WhereFilter;
 import net.vtstar.user.search.service.SearchService;
 import net.vtstar.user.util.UserUtil;
+import net.vtstar.utils.DateUtils;
 import net.vtstar.zhongtong.avi.laboratory.domain.DailyCheckModel;
 import net.vtstar.zhongtong.avi.laboratory.domain.DailyCheckRecord;
 import net.vtstar.zhongtong.avi.laboratory.domain.DailyItemModel;
@@ -175,24 +176,44 @@ public class DailyCheckService {
             workbook = new XSSFWorkbook(is);
             sheet = workbook.getSheetAt(0);
             if (sheet != null) {
-                sheet.getRow(1).getCell(5).setCellValue(recordById.getRev());
-                sheet.getRow(2).getCell(5).setCellValue(recordById.getSheetNo());
-                sheet.getRow(3).getCell(5).setCellValue(recordById.getNo());
+                sheet.getRow(0).getCell(5).setCellValue(recordById.getRev());
+                sheet.getRow(1).getCell(5).setCellValue(recordById.getSheetNo());
+                sheet.getRow(2).getCell(5).setCellValue(recordById.getNo());
                 if ("PICKLING".equals(recordById.getType())){
-                    sheet.getRow(4).getCell(0).setCellValue("酸洗磷化线槽液日常检测报告");
+                    sheet.getRow(3).getCell(0).setCellValue("酸洗磷化线槽液日常检测报告");
                 }else if("ELECTROPHORESIS".equals(recordById.getType())){
-                    sheet.getRow(4).getCell(0).setCellValue("电泳槽液日常检测报告");
+                    sheet.getRow(3).getCell(0).setCellValue("电泳槽液日常检测报告");
                 }else {
-                    sheet.getRow(4).getCell(0).setCellValue("前处理槽液日常检测报告");
+                    sheet.getRow(3).getCell(0).setCellValue("前处理槽液日常检测报告");
                 }
+                int num = 6;
+                for (DailyItemRecord itemRecord : itemModelList){
+                    sheet.getRow(num).getCell(0).setCellValue(itemRecord.getOrderNum());
+                    sheet.getRow(num).getCell(1).setCellValue(itemRecord.getName());
+                    sheet.getRow(num).getCell(2).setCellValue(itemRecord.getIsNecessary() ? "★" : "");
+                    sheet.getRow(num).getCell(3).setCellValue(itemRecord.getCheckResult());
+                    sheet.getRow(num).getCell(4).setCellValue(itemRecord.getRangeAll());
+                    sheet.getRow(num).getCell(5).setCellValue(itemRecord.getFrequency());
+                    sheet.getRow(num).getCell(6).setCellValue(DateUtils.parseDateToString(itemRecord.getCreateTime(), "yyyyMMdd HH:mm:ss"));
+                }
+                sheet.getRow(26).getCell(1).setCellValue(recordById.getRecordInfo());
+                sheet.getRow(34).getCell(1).setCellValue(recordById.getCreateBy());
+                sheet.getRow(34).getCell(4).setCellValue(DateUtils.parseDateToString(recordById.getCreateTime(), "yyyy年MM月dd日"));
             }
             ServletOutputStream outputStream = response.getOutputStream();
-            String filename = "检测报告";
+            String filename;
+            if ("PICKLING".equals(recordById.getType())){
+                filename = "酸洗磷化线槽液日常检测报告";
+            }else if("ELECTROPHORESIS".equals(recordById.getType())){
+                filename = "电泳槽液日常检测报告";
+            }else {
+                filename = "前处理槽液日常检测报告";
+            }
             String codedFileName = URLEncoder.encode(filename, "UTF-8");
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
             response.setHeader("Content-disposition", "attachment;filename=" + codedFileName + ".xls");
-            response.setHeader("fileName", codedFileName + ".xls");
+            response.setHeader("fileName", codedFileName + ".xlsx");
             workbook.write(outputStream);
             outputStream.flush();
             outputStream.close();