联调修改

src/main/java/net/vtstar/zhongtong/avi/laboratory/domain/DailyItemModel.java

@@ -12,6 +12,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @ApiModel(value = "涂装日常检测项模板表")
@@ -22,6 +23,7 @@ public class DailyItemModel {
     @Id
     private Long id;
 
+    @NotNull(message = "检测模板ID为空!")
     @Column(name = "check_model_id")
     @ApiModelProperty(notes = "检测模板ID")
     private Integer checkModelId;
@@ -50,6 +52,10 @@ public class DailyItemModel {
     @ApiModelProperty(notes = "频次")
     private String frequency;
 
+    @Column(name = "is_necessary")
+    @ApiModelProperty(notes = "是否为必检项")
+    private Boolean isNecessary;
+
     @ApiModelProperty(notes = "创建时间")
     private Date createTime;
 

src/main/java/net/vtstar/zhongtong/avi/laboratory/domain/DailyItemRecord.java

@@ -54,6 +54,11 @@ public class DailyItemRecord {
     @ApiModelProperty(notes = "频次")
     private String frequency;
 
+    @Column(name = "is_necessary")
+    @ApiModelProperty(notes = "是否为必检项")
+    private Boolean isNecessary;
+
+
     @Column(name = "create_time")
     @ApiModelProperty(notes = "取样时间")
     private Date createTime;

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

@@ -16,8 +16,6 @@ import net.vtstar.zhongtong.avi.laboratory.mapper.DailyCheckModelMapper;
 import net.vtstar.zhongtong.avi.laboratory.mapper.DailyCheckRecordMapper;
 import net.vtstar.zhongtong.avi.laboratory.mapper.DailyItemModelMapper;
 import net.vtstar.zhongtong.avi.laboratory.mapper.DailyItemRecordMapper;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -177,8 +175,16 @@ public class DailyCheckService {
             workbook = new XSSFWorkbook(is);
             sheet = workbook.getSheetAt(0);
             if (sheet != null) {
-                XSSFRow row = sheet.getRow(4);
-                XSSFCell cell = row.getCell(1);
+                sheet.getRow(1).getCell(5).setCellValue(recordById.getRev());
+                sheet.getRow(2).getCell(5).setCellValue(recordById.getSheetNo());
+                sheet.getRow(3).getCell(5).setCellValue(recordById.getNo());
+                if ("PICKLING".equals(recordById.getType())){
+                    sheet.getRow(4).getCell(0).setCellValue("酸洗磷化线槽液日常检测报告");
+                }else if("ELECTROPHORESIS".equals(recordById.getType())){
+                    sheet.getRow(4).getCell(0).setCellValue("电泳槽液日常检测报告");
+                }else {
+                    sheet.getRow(4).getCell(0).setCellValue("前处理槽液日常检测报告");
+                }
             }
             ServletOutputStream outputStream = response.getOutputStream();
             String filename = "检测报告";