From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001 From: 云 <2163098428@qq.com> Date: 星期四, 18 六月 2026 13:09:28 +0800 Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星 --- src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java index 8daf720..5e960de 100644 --- a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java +++ b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java @@ -1,9 +1,13 @@ package com.ruoyi.inspectiontask.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.basic.dto.StorageBlobDTO; +import com.ruoyi.basic.dto.StorageBlobVO; import com.ruoyi.inspectiontask.pojo.InspectionTask; -import com.ruoyi.sales.pojo.CommonFile; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; import java.util.List; @Data @@ -16,9 +20,22 @@ // // private List<StorageAttachment> attachments; - private List<String> tempFileIds; - private List<CommonFile> commonFileList; //鐢熶骇涓� - private List<CommonFile> commonFileListAfter; //鐢熶骇鍚� - private List<CommonFile> commonFileListBefore; //鐢熶骇鍓� + private List<StorageBlobDTO> commonFileListDTO; //鐢熶骇涓� + private List<StorageBlobDTO> commonFileListAfterDTO; //鐢熶骇鍚� + private List<StorageBlobDTO> commonFileListBeforeDTO; //鐢熶骇鍓� + private List<StorageBlobVO> commonFileListVO; //鐢熶骇涓� + private List<StorageBlobVO> commonFileListAfterVO; //鐢熶骇鍚� + private List<StorageBlobVO> commonFileListBeforeVO; //鐢熶骇鍓� + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTimeStart; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTimeEnd; + + private String areaName; } -- Gitblit v1.9.3