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/projectManagement/dto/SaveInfoDto.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java b/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
index aa1d99c..9fbef30 100644
--- a/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
+++ b/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
@@ -1,13 +1,15 @@
package com.ruoyi.projectManagement.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.vo.SimpleFileVo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -24,7 +26,7 @@
public class SaveInfoDto implements Serializable {
private Long id;
private String no;
- @NotBlank
+ @NotBlank(message = "title涓虹┖")
private String title;
private Long clientId;
private String clientName;
@@ -35,7 +37,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate establishTime;
// 椤圭洰绫诲瀷 id
- @NotNull
+ @NotNull(message = "projectManagementPlanId涓虹┖")
private Long projectManagementPlanId;
private String source;
@@ -43,7 +45,7 @@
private Long managerId;
private String managerName;
private Long salesmanId;
- private String salesmanName;
+ private String salesmanName;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -61,6 +63,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate actualEndTime;
+ // 瀹℃牳鐘舵��
+ private Integer reviewStatus;
+
// 椤圭洰鐘舵��
private Integer status;
@@ -76,7 +81,14 @@
private String remark;
+ @JsonIgnore
+ private String attachment;
+
+ private List<SimpleFileVo> attachmentList;
+
private List<String> attachmentIds; // 闄勪欢ids
private List<TeamDto> teamList;
+
+ private List<PlanStageDto> planStage;
}
--
Gitblit v1.9.3