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/ApsPartPlan.java |  109 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
index 61dea35..0796a29 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -1,11 +1,13 @@
 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;
 
 /**
  * 闆朵欢璁″垝绠＄悊瀵硅薄 aps_part_plan
@@ -19,14 +21,13 @@
 
     /** 涓婚敭id */
     private String id;
-
     /** 涓昏鍒掑憳 */
-    @Excel(name = "涓昏鍒掑憳")
+    @Excel(name = "涓昏鍒�")
     private String masterPlanner;
 
     /** 鍛ㄦ棩 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "MM-dd")
     private Date weekDay;
 
     /** 鍛ㄥ害 */
@@ -75,11 +76,11 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Long productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鑹搧鏁伴噺 */
     @Excel(name = "鑹搧鏁伴噺")
-    private Long goodProductsQuantity;
+    private BigDecimal goodProductsQuantity;
 
     /** 宸ュ簭鍙� */
     @Excel(name = "宸ュ簭鍙�")
@@ -121,11 +122,11 @@
 
     /** 鏄惁鎸傝捣 */
     @Excel(name = "鏄惁鎸傝捣")
-    private Integer isSuspended;
+    private String isSuspended;
 
     /** 澶栧崗鏍囪瘑 */
     @Excel(name = "澶栧崗鏍囪瘑")
-    private Integer isOutsourcing;
+    private String isOutsourcing;
 
     /** 璐﹀ */
     @Excel(name = "璐﹀")
@@ -159,6 +160,59 @@
     /** 椋庨櫓鏍囪瘑 */
     @Excel(name = "椋庨櫓鏍囪瘑")
     private Integer hasRisk;
+
+    /** 浣滀笟锛堝伐搴忓悕绉帮級 */
+    @Excel(name = "浣滀笟")
+    private String stdOp;
+
+    /** 宸ュ巶 */
+//    @Excel(name = "宸ュ巶")
+    private String plant;
+
+    /** 褰撳墠宸ュ簭鐘舵�� */
+    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+    private String opStatus;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+    private String nextOpName;
+
+    public BigDecimal getUnmatchedQuantity() {
+        return unmatchedQuantity;
+    }
+
+    public void setUnmatchedQuantity(BigDecimal unmatchedQuantity) {
+        this.unmatchedQuantity = unmatchedQuantity;
+    }
+
+    public String getProfessionalAffiliation() {
+        return professionalAffiliation;
+    }
+
+    public void setProfessionalAffiliation(String professionalAffiliation) {
+        this.professionalAffiliation = professionalAffiliation;
+    }
+
+    /** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
+    private BigDecimal unmatchedQuantity;
+    /** 涓撲笟褰掑睘*/
+    private String professionalAffiliation;
+
+    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 void setId(String id) 
     {
@@ -300,22 +354,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;
     }
@@ -410,22 +464,22 @@
         return nextProcessDeparment;
     }
 
-    public void setIsSuspended(Integer isSuspended) 
+    public void setIsSuspended(String isSuspended)
     {
         this.isSuspended = isSuspended;
     }
 
-    public Integer getIsSuspended() 
+    public String getIsSuspended()
     {
         return isSuspended;
     }
 
-    public void setIsOutsourcing(Integer isOutsourcing) 
+    public void setIsOutsourcing(String isOutsourcing)
     {
         this.isOutsourcing = isOutsourcing;
     }
 
-    public Integer getIsOutsourcing() 
+    public String getIsOutsourcing()
     {
         return isOutsourcing;
     }
@@ -510,6 +564,14 @@
         return hasRisk;
     }
 
+    public void setStdOp(String stdOp) {
+        this.stdOp = stdOp;
+    }
+
+    public String getStdOp() {
+        return stdOp;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -548,6 +610,17 @@
             .append("isStockComplete", getIsStockComplete())
             .append("hasTurnback", getHasTurnback())
             .append("hasRisk", getHasRisk())
+            .append("plant", getPlant())
+            .append("stdOp", getStdOp())
+            .append("opStatus", getOpStatus())
+            .append("nextOpName", getNextOpName())
             .toString();
     }
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
 }

--
Gitblit v1.9.3