Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

4 天以前 d14764d097691d35e7015c2d161c612aa7642a8e

 src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java

@@ -3,18 +3,35 @@
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

@Data
public class InspectionTaskDto extends InspectionTask {

    private List<StorageBlobDTO> storageBlobDTO;
    private List<StorageBlobDTO> beforeProduction;
    private List<StorageBlobDTO> afterProduction;
    private List<StorageBlobDTO> productionIssues;
//    private List<StorageBlobDTO> storageBlobDTO;
//    private List<StorageBlobDTO> beforeProduction;
//    private List<StorageBlobDTO> afterProduction;
//    private List<StorageBlobDTO> productionIssues;
//
//    private List<StorageAttachment> attachments;

    private List<StorageAttachment> attachments;
    private List<String> tempFileIds;
    private List<CommonFile> commonFileList; //生产中
    private List<CommonFile> commonFileListAfter;  //生产后
    private List<CommonFile> commonFileListBefore; //生产前

    /**
     * 要求的执行时间（来自定时任务的nextExecutionTime）
     */
    private LocalDateTime nextExecutionTime;

    /**
     * 状态：EXPIRED-已过期，IN_PROGRESS-巡检中，PENDING-待巡检
     */
    private String status;

}