From dadf503b15f3423980ad2bc17d23ea1a444aca10 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 14 五月 2025 17:48:00 +0800
Subject: [PATCH] 【UPDATE】修改mapper适配mybatis-plus
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java | 88 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 13 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
index b0b32f7..e477388 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -1,11 +1,14 @@
package com.aps.core.domain;
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
/**
* 姘斾綋绠¤矾璁″垝绠＄悊瀵硅薄 aps_gas_piping_plan
@@ -74,11 +77,11 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Long productionQuantity;
+ private BigDecimal productionQuantity;
/** 鑹搧鏁伴噺 */
@Excel(name = "鑹搧鏁伴噺")
- private Long goodProductsQuantity;
+ private BigDecimal goodProductsQuantity;
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
@@ -93,13 +96,13 @@
private String department;
/** 璁″垝寮�宸ユ棩 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planStartDay;
/** 璁″垝瀹屽伐鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planEndDay;
/** 澶囨枡鏂欏彿 */
@@ -158,6 +161,63 @@
/** 椋庨櫓鏍囪瘑 */
@Excel(name = "椋庨櫓鏍囪瘑")
private Integer hasRisk;
+
+ /** 褰撳墠宸ュ簭鐘舵�� */
+ @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+ private String opStatus;
+
+ /** 涓嬩竴宸ュ簭鍚嶇О */
+ @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+ private String nextOpName;
+
+ /** 涓嬩竴宸ュ簭鍚嶇О */
+ @Excel(name = "褰撳墠宸ュ簭鍚嶇О")
+ private String stdOp;
+
+ public String getStdOp() {
+ return stdOp;
+ }
+
+ public void setStdOp(String stdOp) {
+ this.stdOp = stdOp;
+ }
+
+ public String getOpStatus() {
+ return opStatus;
+ }
+
+ public void setOpStatus(String opStatus) {
+ this.opStatus = opStatus;
+ }
+
+ public String getNextOpName() {
+ return nextOpName;
+ }
+
+ public void setNextOpName(String nextOpName) {
+ this.nextOpName = nextOpName;
+ }
+
+ public String getPlanType() {
+ return planType;
+ }
+
+ public void setPlanType(String planType) {
+ this.planType = planType;
+ }
+
+ private String planType;
+
+ /** 宸ュ簭鍒楄〃 */
+ private List<ApsProcessRoute> apsProcessRoutes;
+
+ public List<ApsProcessRoute> getApsProcessRoutes() {
+ return apsProcessRoutes;
+ }
+
+ public void setApsProcessRoutes(List<ApsProcessRoute> apsProcessRoutes) {
+ this.apsProcessRoutes = apsProcessRoutes;
+ }
public void setId(String id)
{
@@ -299,22 +359,22 @@
return versionNumber;
}
- public void setProductionQuantity(Long productionQuantity)
+ public void setProductionQuantity(BigDecimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Long getProductionQuantity()
+ public BigDecimal getProductionQuantity()
{
return productionQuantity;
}
- public void setGoodProductsQuantity(Long goodProductsQuantity)
+ public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
{
this.goodProductsQuantity = goodProductsQuantity;
}
- public Long getGoodProductsQuantity()
+ public BigDecimal getGoodProductsQuantity()
{
return goodProductsQuantity;
}
@@ -547,6 +607,8 @@
.append("isStockComplete", getIsStockComplete())
.append("hasTurnback", getHasTurnback())
.append("hasRisk", getHasRisk())
+ .append("opStatus", getOpStatus())
+ .append("nextOpName", getNextOpName())
.toString();
}
}
--
Gitblit v1.9.3