From d7db245433f576affb379b82177762d80a2a842d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 15:09:12 +0800
Subject: [PATCH] 钣金详细计划-Excel导出列名更新
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java | 23 +++++++++++------------
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java | 2 ++
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingRouteStatMapper.java | 2 ++
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
index 9afd5bc..7190995 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
@@ -26,7 +26,7 @@
private String workOrderNo;
/** 宸ュ簭鍚嶇О */
- @Excel(name = "宸ュ簭鍚嶇О")
+ @Excel(name = "宸ュ簭鍚嶇О", width = 50)
private String processName;
private Integer num;
@@ -51,27 +51,26 @@
@Excel(name = "宸ュ簭鎬诲伐鏃�")
private BigDecimal processTotalTime;
- /** 璁″垝瀹屾垚鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date processPlanEndDay;
-
- /** 璁＄畻瀹屾垚鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date computePlanEndDay;
-
-
/** 璁″垝寮�宸ユ棩 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date processPlanStartDay;
+ /** 璁″垝瀹屾垚鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date processPlanEndDay;
+
/** 璁㈠崟寮�宸ユ棩 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁㈠崟寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁㈠崟瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderPlanEndDay;
+ /** 璁＄畻瀹屾垚鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date computePlanEndDay;
+
/** 璁捐宸ユ椂 */
private Long designTimes;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
index 231632b..329bc9b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
@@ -1,6 +1,7 @@
package com.aps.core.mapper;
import com.aps.core.domain.ApsGasPipelineCapacityPlan;
+import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -10,6 +11,7 @@
* @author hjy
* @date 2025-04-24
*/
+@Mapper
public interface ApsGasPipelineCapacityPlanMapper
{
/**
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingRouteStatMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingRouteStatMapper.java
index 992ecaf..074cf17 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingRouteStatMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipingRouteStatMapper.java
@@ -1,6 +1,7 @@
package com.aps.core.mapper;
import com.aps.core.domain.ApsGasPipingRouteStat;
+import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -10,6 +11,7 @@
* @author hjy
* @date 2025-04-24
*/
+@Mapper
public interface ApsGasPipingRouteStatMapper
{
/**
--
Gitblit v1.9.3