(更新至 353906)

zss

2024-12-20 010b1e70f0c43c88ee93f4b770c0ea0cf9add2d2

(更新至	353906)

 cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeCalibrationScheduleController.java

@@ -65,7 +65,7 @@
    @PostMapping("exportOfValueTraceabilityPlan")
    public void exportOfValueTraceabilityPlan(String instrumentName, String managementNumber,
                                       HttpServletResponse response) throws Exception {
        IPage<FeCalibrationSchedule> data = feCalibrationScheduleService.page(new Page<>(1, -1),instrumentName, managementNumber);
        IPage<FeCalibrationSchedule> data = feCalibrationScheduleService.page(new Page<>(-1, -1),instrumentName, managementNumber);
        List<FeCalibrationScheduleExport> studentList  = JSONObject.parseArray(JSON.toJSONString(data.getRecords()), FeCalibrationScheduleExport.class);
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setHeader("requestType", "excel");

 cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeStandardSubstanceAcceptance.java

@@ -1,5 +1,6 @@
package com.yuanchu.mom.pojo;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -30,6 +31,7 @@
@Setter
@TableName("cnas_fe_standard_substance_acceptance")
@ApiModel(value = "FeStandardSubstanceAcceptance对象", description = "标准物质验收")
@ExcelIgnoreUnannotated
public class FeStandardSubstanceAcceptance implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -38,7 +40,6 @@
    private Integer id;

    @ApiModelProperty("清单id")
    @ExcelProperty("清单id")
    private Integer substanceId;

    @ApiModelProperty("到货日期")