From d22b530fa0fbd910d8d7baefa29d88d755568e68 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 15 十二月 2025 10:01:41 +0800
Subject: [PATCH] 1、 修复权限相关的bug

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
index d0f7876..68fc92e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/ReportingWork.java
@@ -2,14 +2,16 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wu
@@ -24,13 +26,13 @@
     /**
      * <鎶ュ伐涓昏〃>
      */
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 鎶ュ伐缂栧彿
      */
-    private String reportingWorkId;
+    private String reportingWorkId = "";
 
     /**
      * 閿�鍞崟鍙�
@@ -52,10 +54,10 @@
      */
     private String thisProcess;
 
-    /**
-     * 璁惧缂栧彿
-     */
-    private byte[] deviceId;
+//    /**
+//     * 璁惧缂栧彿
+//     */
+//    private byte[] deviceId;
 
     /**
      * 璁惧鍚嶇О
@@ -65,12 +67,12 @@
     /**
      * 涓婂伐搴�
      */
-    private String previousProcess;
+//    private String previousProcess;
 
     /**
      * 涓婂伐搴忔暟閲�
      */
-    private Integer previousProcessQuantity;
+//    private Integer previousProcessQuantity;
 
     /**
      * 鏈伐搴忔暟閲�
@@ -110,32 +112,32 @@
     /**
      * 鎶ュ伐鐘舵��
      */
-    private Integer reportingWorkState;
+//    private Integer reportingWorkState;
 
     /**
      * 瀹℃牳浜�
      */
-    private String reviewed;
+//    private String reviewed;
 
     /**
      * 瀹℃牳鐘舵��(榛樿0,瀹℃牳閫氳繃1锛屼笉閫氳繃2,灏忎簬0鍒犻櫎)
      */
-    private Integer reviewedState;
+//    private Integer reviewedState;
 
     /**
      * 澶囨敞
      */
-    private String notes;
+//    private String notes;
 
     /**
      * 璐ㄦ鍛�
      */
-    private String qualityInspector;
+//    private String qualityInspector;
 
     /**
      * 鍖呰鏂瑰紡
      */
-    private String packagingMethod;
+//    private String packagingMethod;
 
     /**
      * 鎶ュ伐鏃堕棿
@@ -145,12 +147,12 @@
     /**
      * 瀹℃牳鏃堕棿
      */
-    private LocalDateTime examineTime;
+//    private LocalDateTime examineTime;
 
     /**
      * 璐ㄦ鏃堕棿
      */
-    private LocalDateTime qualityInsTime;
+//    private LocalDateTime qualityInsTime;
 
     /**
      * 鍒涘缓鑰卛d
@@ -165,6 +167,7 @@
     /**
      * 寤虹珛鏃堕棿
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**

--
Gitblit v1.8.0