From 0a911e2844ae6388a84aa228100f588e9d0deadc Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Thu, 22 Feb 2024 10:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95VoBo=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/mts/domain/bo/MesPlanRecordBo.java  | 15 +++---------
 .../ruoyi/mts/domain/vo/MesPlanRecordVo.java  | 24 ++++---------------
 .../impl/MesPlanDetailServiceImpl.java        | 12 ++++------
 3 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java
index a404e47..4576091 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java
@@ -5,22 +5,12 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.*;
-
-import java.util.Date;
-
-
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
 /**
  * 生产计划明细日期记录业务对象 mes_plan_record
  *
@@ -55,7 +45,8 @@ public class MesPlanRecordBo extends BaseEntity {
      */
     private String remark;
 
-
+    private String ganttColor;
+    
     private String flag;
     /**
      * oss_id
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java
index d54c01c..bbfde9e 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java
@@ -1,17 +1,11 @@
 package com.ruoyi.mts.domain.vo;
 
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
 
-import java.util.Date;
-
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 生产计划明细日期记录视图对象 mes_plan_record
@@ -48,21 +42,13 @@ public class MesPlanRecordVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 开始时间
-     */
-    @ExcelProperty(value = "开始时间")
-    private Date startDate;
-
-    /**
-     * 结束时间
-     */
-    @ExcelProperty(value = "结束时间")
-    private Date endDate;
-
     /**
      * oss_id
      */
     @ExcelProperty(value = "oss_id")
     private Long ossId;
+
+    private String ganttColor;
+
+
 }
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java
index 03ca631..c745b5f 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java
@@ -19,10 +19,7 @@ import com.ruoyi.mts.service.IMesPlanRecordService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 /**
  * 生产计划明细Service业务层处理
@@ -66,8 +63,9 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
                 res.addAll(i + 1, children);
             }
         }
-        LinkedList<MesPlanDetailVo> data = new LinkedList<>();
-        for (int i = 0; i < res.size(); i++) {
+        int size = res.size();
+        List<MesPlanDetailVo> data = new ArrayList<>(size<<2);
+        for (int i = 0; i < size; i++) {
             //默认第一个为计划数据
             MesPlanDetailVo planVo = res.get(i);
             Long id = planVo.getId();
@@ -127,7 +125,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
         if (flag) {
             bo.setId(add.getId());
         }
-        
+
         Date planStartDate = bo.getPlanStartDate();
         Date planEndDate = bo.getPlanEndDate();