From 57f7298c3d870f0992444991cee670dfc1c51f42 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期三, 01 十一月 2023 14:32:36 +0800
Subject: [PATCH] feat:调整实体类

---
 consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
index 55e6a4b..61d1c0a 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhFormScrapped.java
@@ -60,13 +60,13 @@
     @JsonIgnore
     protected boolean isset_dealTime = false;
 
-    private String departmentId = null;
-    @JsonIgnore
-    protected boolean isset_departmentId = false;
-
-    private Long departmentName = null;
+    private String departmentName = null;
     @JsonIgnore
     protected boolean isset_departmentName = false;
+
+    private Long departmentId = null;
+    @JsonIgnore
+    protected boolean isset_departmentId = false;
 
     private String uploadFiles = null;
     @JsonIgnore
@@ -251,32 +251,32 @@
         return this.dealTime == null;
     }
 
-    public String getDepartmentId() {
-        return this.departmentId;
-    }
-
-    public void setDepartmentId(String departmentId) {
-        this.departmentId = departmentId;
-        this.isset_departmentId = true;
-    }
-
-    @JsonIgnore
-    public boolean isEmptyDepartmentId() {
-        return this.departmentId == null || this.departmentId.length() == 0;
-    }
-
-    public Long getDepartmentName() {
+    public String getDepartmentName() {
         return this.departmentName;
     }
 
-    public void setDepartmentName(Long departmentName) {
+    public void setDepartmentName(String departmentName) {
         this.departmentName = departmentName;
         this.isset_departmentName = true;
     }
 
     @JsonIgnore
     public boolean isEmptyDepartmentName() {
-        return this.departmentName == null;
+        return this.departmentName == null || this.departmentName.length() == 0;
+    }
+
+    public Long getDepartmentId() {
+        return this.departmentId;
+    }
+
+    public void setDepartmentId(Long departmentId) {
+        this.departmentId = departmentId;
+        this.isset_departmentId = true;
+    }
+
+    @JsonIgnore
+    public boolean isEmptyDepartmentId() {
+        return this.departmentId == null;
     }
 
     public String getUploadFiles() {
@@ -324,8 +324,8 @@
                 .append("operatorId=").append(this.operatorId)
                 .append("operatorName=").append(this.operatorName)
                 .append("dealTime=").append(this.dealTime)
-                .append("departmentId=").append(this.departmentId)
                 .append("departmentName=").append(this.departmentName)
+                .append("departmentId=").append(this.departmentId)
                 .append("uploadFiles=").append(this.uploadFiles)
                 .append("states=").append(this.states)
                 .toString();
@@ -375,12 +375,12 @@
         if (this.isset_dealTime) {
             l_wh_form_scrapped.setDealTime(this.getDealTime());
         }
-        if (this.isset_departmentId) {
-            l_wh_form_scrapped.setDepartmentId(this.getDepartmentId());
-        }
         if (this.isset_departmentName) {
             l_wh_form_scrapped.setDepartmentName(this.getDepartmentName());
         }
+        if (this.isset_departmentId) {
+            l_wh_form_scrapped.setDepartmentId(this.getDepartmentId());
+        }
         if (this.isset_uploadFiles) {
             l_wh_form_scrapped.setUploadFiles(this.getUploadFiles());
         }

--
Gitblit v1.9.1