From c6ff75126f7e5a795d503272280dd3d72bcdb294 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 10:35:58 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 20 ++++++++++++++++++--
1 files changed, 18 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..15833aa 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;
/**
@@ -129,6 +129,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
@@ -213,7 +214,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 +312,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