From 039ca26b5311753223c4a81997ecc5cad6125d62 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 26 二月 2022 09:20:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/sc/manager/entity/Issue.java |   82 ++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/zy/sc/manager/entity/Issue.java b/src/main/java/com/zy/sc/manager/entity/Issue.java
index 8a55605..fcdb544 100644
--- a/src/main/java/com/zy/sc/manager/entity/Issue.java
+++ b/src/main/java/com/zy/sc/manager/entity/Issue.java
@@ -1,54 +1,22 @@
 package com.zy.sc.manager.entity;
 
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.core.common.SpringUtils;
-import com.zy.sc.system.service.HostService;
-import com.zy.sc.system.entity.Host;
 import com.baomidou.mybatisplus.annotations.TableField;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.sc.manager.service.IssueTypeService;
-import com.zy.sc.manager.entity.IssueType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.zy.sc.system.entity.Host;
+import com.zy.sc.system.entity.User;
+import com.zy.sc.system.service.HostService;
+import com.zy.sc.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.core.common.SpringUtils;
-import com.zy.sc.system.service.UserService;
-import com.zy.sc.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.core.common.SpringUtils;
-import com.zy.sc.system.service.UserService;
-import com.zy.sc.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
 
-import com.baomidou.mybatisplus.annotations.TableName;
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @TableName("man_issue")
 public class Issue implements Serializable {
@@ -59,6 +27,7 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -153,11 +122,14 @@
     @ApiModelProperty(value= "渚涘簲鍟�")
     private String dealer;
 
-    @ApiModelProperty(value= "")
+    /**
+     * 娴佺▼ 1: 鑽夌  2: 鎻愪氦  3: 宸茶  4: 浣滀笟  5: 瀹屾垚  6: 鍙栨秷
+     */
+    @ApiModelProperty(value= "娴佺▼ 1: 鑽夌  2: 鎻愪氦  3: 宸茶  4: 浣滀笟  5: 瀹屾垚  6: 鍙栨秷")
     private Integer settle;
 
     /**
-     * 鐘舵�� 1: 姝e父  0: 绂佺敤  
+     * 鐘舵�� 1: 姝e父  0: 绂佺敤
      */
     @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
     private Integer status;
@@ -239,7 +211,7 @@
 //            null,    // 鍙戠幇浜�
 //            null,    // 鑱旂郴鏂瑰紡
 //            null,    // 渚涘簲鍟�
-//            null,    // 
+//            null,    //
 //            null,    // 鐘舵��
 //            null,    // 娣诲姞浜哄憳
 //            null,    // 娣诲姞鏃堕棿
@@ -415,6 +387,26 @@
         this.settle = settle;
     }
 
+    public String getSettle$(){
+        if (null == this.settle){ return null; }
+        switch (this.settle){
+            case 1:
+                return "鑽夌";
+            case 2:
+                return "鎻愪氦";
+            case 3:
+                return "宸茶";
+            case 4:
+                return "浣滀笟";
+            case 5:
+                return "瀹屾垚";
+            case 6:
+                return "鍙栨秷";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
     public Integer getStatus() {
         return status;
     }

--
Gitblit v1.9.1