From 25cc1b887f5421353d94c5e6be0fca56b3f2e668 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 21 五月 2025 16:29:24 +0800
Subject: [PATCH] 优化Job

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java |   99 +++++++++++++++++++++++++++----------------------
 1 files changed, 55 insertions(+), 44 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 da7a861..a51836c 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,7 +1,9 @@
 package com.aps.core.domain;
 
 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;
@@ -11,14 +13,13 @@
 
 /**
  * 鐗╂枡浜у搧缁勬暟鎹鐞嗗璞� aps_material_product_group_management
- * 
+ *
  * @author ruoyi
  * @date 2025-05-19
  */
 @Schema(description = "鐗╂枡浜у搧缁勬暟鎹鐞嗗疄浣撶被")
 @Data
-public class ApsMaterialProductGroupManagement extends BaseEntity
-{
+public class ApsMaterialProductGroupManagement extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @Id
@@ -27,104 +28,114 @@
     @Schema(description = "ID")
     private Long id;
 
-    /** 閫傜敤宸ュ巶  鍙傝�� aps_factory */
+    /**
+     * 閫傜敤宸ュ巶  鍙傝�� aps_factory
+     */
     @Excel(name = "閫傜敤宸ュ巶  鍙傝�� aps_factory")
     @Schema(description = "閫傜敤宸ュ巶  鍙傝�� aps_factory")
     private String factory;
 
-    /** 鏂欏彿 */
+    /**
+     * 鏂欏彿
+     */
     @Excel(name = "鏂欏彿")
     @Schema(description = "鏂欏彿")
     private String materialCode;
 
-    /** 涓撲笟 鍙傝��	aps_domain */
+    /**
+     * 涓撲笟 鍙傝��	aps_domain
+     */
     @Excel(name = "涓撲笟 鍙傝��	aps_domain")
     @Schema(description = "涓撲笟 鍙傝��	aps_domain")
     private String domain;
 
-    /** 鏄惁涓轰富闃� 鏄�/鍚� */
+    /**
+     * 鏄惁涓轰富闃� 鏄�/鍚�
+     */
     @Excel(name = "鏄惁涓轰富闃� 鏄�/鍚�")
     @Schema(description = "鏄惁涓轰富闃� 鏄�/鍚�")
     private String isMain;
 
-    /** 鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠� */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String key;
+
+    @JsonIgnore
+    public String getKey() {
+        if (key == null) {
+            key = getFactory() + "##" + getMaterialCode();
+        }
+        return key;
+    }
+
+    /**
+     * 鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�
+     */
     @Excel(name = "鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�")
     @Schema(description = "鏂欏彿绫诲埆 鍒堕�犱欢/閲囪喘浠�")
     private String materialType;
 
-    public void setId(Long id) 
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setFactory(String factory) 
-    {
+    public void setFactory(String factory) {
         this.factory = factory;
     }
 
-    public String getFactory() 
-    {
+    public String getFactory() {
         return factory;
     }
 
-    public void setMaterialCode(String materialCode) 
-    {
+    public void setMaterialCode(String materialCode) {
         this.materialCode = materialCode;
     }
 
-    public String getMaterialCode() 
-    {
+    public String getMaterialCode() {
         return materialCode;
     }
 
-    public void setDomain(String domain) 
-    {
+    public void setDomain(String domain) {
         this.domain = domain;
     }
 
-    public String getDomain() 
-    {
+    public String getDomain() {
         return domain;
     }
 
-    public void setIsMain(String isMain) 
-    {
+    public void setIsMain(String isMain) {
         this.isMain = isMain;
     }
 
-    public String getIsMain() 
-    {
+    public String getIsMain() {
         return isMain;
     }
 
-    public void setMaterialType(String materialType) 
-    {
+    public void setMaterialType(String materialType) {
         this.materialType = materialType;
     }
 
-    public String getMaterialType() 
-    {
+    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();
+        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