From 20d3e1da6517ed5e55ae3613ccbbb01f1b9eda2e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 25 四月 2026 11:53:11 +0800
Subject: [PATCH] fix(approve): 修复审批流程中的数据类型和业务逻辑问题
---
src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
index 25b0cfd..58c7ce4 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
@@ -1,5 +1,7 @@
package com.ruoyi.production.pojo;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
@@ -7,11 +9,16 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.production.dto.MaterialInfoDto;
import com.ruoyi.production.dto.PlateMakingDto;
import com.ruoyi.production.dto.ProcessContentDto;
+import com.ruoyi.production.dto.ProductOrderDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
/**
* 鍗板埛瀹氬嵃鍗�
@@ -35,19 +42,23 @@
/**
* 瀵瑰簲鐨勭敓浜у伐鍗�
*/
- @TableField(value = "product_order")
- private Long productOrder;
+ @TableField(value = "product_order_id")
+ private Long productOrderId;
/**
* 鍒跺崟鏃ユ湡
*/
@TableField(value = "print_order_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime printOrderTime;
/**
* 瀹屾垚鏃ユ湡
*/
@TableField(value = "finish_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
@@ -186,12 +197,16 @@
*
*/
@TableField(value = "create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
*
*/
@TableField(value = "update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@TableField(exist = false)
@@ -216,4 +231,51 @@
@TableField(value = "update_user_name", fill = FieldFill.INSERT_UPDATE)
private String updateUserName;
+
+ /**
+ * 灏忕洅鏁伴噺
+ */
+ @TableField(value = "small_box_qty")
+ private String smallBoxQty;
+
+ /**
+ * 涓洅鏁伴噺
+ */
+ @TableField(value = "medium_box_qty")
+ private String mediumBoxQty;
+
+ /**
+ * 鎴愬搧id
+ */
+ @TableField(value = "product_model_id")
+ private Long productModelId;
+
+ /**
+ * 鍒囨枡鍥剧ず鏂囦欢id
+ */
+ @TableField(value = "cutting_file_id")
+ private Long cuttingFileId;
+
+ /**
+ * 瀹㈡埛鍗曚綅
+ */
+ @TableField(value = "client_name")
+ private String clientName;
+
+
+ public ProductOrderDto convertProductOrderDto(@NotNull ProductOrderDto dto) {
+ dto.setCutSize(this.getCutSize());
+ dto.setSmallBoxQty(this.getSmallBoxQty());
+ dto.setMediumBoxQty(this.getMediumBoxQty());
+ // 鑹叉暟 涓哄伐搴忓紑鏁扮涓�涓�
+ if(CollUtil.isNotEmpty(this.processContent)){
+ ProcessContentDto processContentDto = BeanUtil.toBean(
+ processContent.get(0),
+ ProcessContentDto.class
+ );
+ dto.setPrintColorCount(processContentDto.getOpenCount());
+ }
+ // 澶囨敞宸茬粡濉厖鍒颁簡 ProductOrderDto涓棤闇�鍏冲績
+ return dto;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3