From 90869d75f496350fcb11587010fef20fba16157b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 08 四月 2026 14:52:59 +0800
Subject: [PATCH] fix: 新增主生成计划的申请单编号不能重复,报工查看详情数据重复问题
---
src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanImportDto.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanImportDto.java b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanImportDto.java
index d43ab8f..919adbc 100644
--- a/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanImportDto.java
+++ b/src/main/java/com/ruoyi/productionPlan/dto/ProductionPlanImportDto.java
@@ -1,7 +1,5 @@
package com.ruoyi.productionPlan.dto;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
@@ -9,7 +7,7 @@
import lombok.Data;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* <br>
@@ -62,21 +60,21 @@
* 闀�
*/
@ApiModelProperty("闀�")
- @Excel(name = "闀�")
+ @Excel(name = "闀�(mm)")
private Integer length;
/**
* 瀹�
*/
@ApiModelProperty("瀹�")
- @Excel(name = "瀹�")
+ @Excel(name = "瀹�(mm)")
private Integer width;
/**
* 楂�
*/
@ApiModelProperty("楂�")
- @Excel(name = "楂�")
+ @Excel(name = "楂�(mm)")
private Integer height;
/**
@@ -103,18 +101,18 @@
/**
* 寮�濮嬫棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("寮�濮嬫棩鏈�")
- @Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime startDate;
+ @Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd")
+ private Date startDate;
/**
* 缁撴潫鏃ユ湡
*/
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("缁撴潫鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime endDate;
+ @Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd")
+ private Date endDate;
/**
* 鎻愪氦浜�
--
Gitblit v1.9.3