From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java | 87 +++++--------------------------------------
1 files changed, 10 insertions(+), 77 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java
index a51836c..2fc7dea 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java
@@ -1,14 +1,12 @@
package com.aps.core.domain;
+import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
import org.springframework.data.annotation.Id;
/**
@@ -31,7 +29,7 @@
/**
* 閫傜敤宸ュ巶 鍙傝�� aps_factory
*/
- @Excel(name = "閫傜敤宸ュ巶 鍙傝�� aps_factory")
+ @Excel(name = "閫傜敤宸ュ巶")
@Schema(description = "閫傜敤宸ュ巶 鍙傝�� aps_factory")
private String factory;
@@ -45,20 +43,26 @@
/**
* 涓撲笟 鍙傝�� aps_domain
*/
- @Excel(name = "涓撲笟 鍙傝�� aps_domain")
+ @Excel(name = "涓撲笟褰掑睘")
@Schema(description = "涓撲笟 鍙傝�� aps_domain")
private String domain;
/**
* 鏄惁涓轰富闃� 鏄�/鍚�
*/
- @Excel(name = "鏄惁涓轰富闃� 鏄�/鍚�")
+ @Excel(name = "鏄惁涓婚樁鏂欏彿")
@Schema(description = "鏄惁涓轰富闃� 鏄�/鍚�")
private String isMain;
@JsonIgnore
@TableField(exist = false)
private String key;
+ /**
+ * 鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�
+ */
+ @Excel(name = "鏂欏彿绫诲埆")
+ @Schema(description = "鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�")
+ private String materialType;
@JsonIgnore
public String getKey() {
@@ -66,76 +70,5 @@
key = getFactory() + "##" + getMaterialCode();
}
return key;
- }
-
- /**
- * 鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�
- */
- @Excel(name = "鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�")
- @Schema(description = "鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�")
- private String materialType;
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setFactory(String factory) {
- this.factory = factory;
- }
-
- public String getFactory() {
- return factory;
- }
-
- public void setMaterialCode(String materialCode) {
- this.materialCode = materialCode;
- }
-
- public String getMaterialCode() {
- return materialCode;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setIsMain(String isMain) {
- this.isMain = isMain;
- }
-
- public String getIsMain() {
- return isMain;
- }
-
- public void setMaterialType(String materialType) {
- this.materialType = materialType;
- }
-
- public String getMaterialType() {
- return materialType;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("factory", getFactory())
- .append("materialCode", getMaterialCode())
- .append("domain", getDomain())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("isMain", getIsMain())
- .append("materialType", getMaterialType())
- .toString();
}
}
--
Gitblit v1.9.3