From 00298a6bbcf433f244df08037dad5470635934a1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 20 五月 2025 08:04:48 +0800
Subject: [PATCH] #问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index c79a9b6..cd25beb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -100,7 +100,7 @@
      * 棰勮鍒拌揪鏃堕棿
      */
     @ApiModelProperty(value= "棰勮鍒拌揪鏃堕棿")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date arrTime;
 
     /**
@@ -213,7 +213,9 @@
             return "";
         }
         DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
-        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE).eq(DictData::getValue, this.type));
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
+                .eq(DictData::getValue, this.type));
         if (Objects.isNull(dictData)) {
             return null;
         }
@@ -309,5 +311,18 @@
                 return null;
         }
     }
+    public String getNtyStatus$(){
+        if (null == this.ntyStatus){ return "error"; }
+        switch (this.ntyStatus){
+            case 0:
+                return "鏈笂鎶�";
+            case 1:
+                return "宸蹭笂鎶�";
+            case 2:
+                return "閮ㄥ垎涓婃姤";
+            default:
+                return "error";
+        }
+    }
 
 }

--
Gitblit v1.9.1