From 52795d13ae23ef9ef870eefe9da8e49e8526bba1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 14:42:04 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 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 9adbe56..1017e0e 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
@@ -124,7 +124,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -188,27 +187,19 @@
this.memo = memo;
}
-// AsnOrder asnOrder = new AsnOrder(
-// null, // 缂栧彿
-// null, // PO鍗曞彿
-// null, // PO鍗曟嵁鏍囪瘑
-// null, // 鍗曟嵁绫诲瀷[闈炵┖]
-// null, // 涓氬姟绫诲瀷[闈炵┖]
-// null, // 閫佽揣鏁伴噺[闈炵┖]
-// null, // 宸叉敹鏁伴噺[闈炵┖]
-// null, // 鐗╂祦鍗曞彿
-// null, // 棰勮鍒拌揪鏃堕棿
-// null, // 閲婃斁鐘舵�乕闈炵┖]
-// null, // 鍚嶇О
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
+ public String getExceStatus$() {
+ if (Cools.isEmpty(this.exceStatus)){
+ return "";
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
public String getType$(){
if (Cools.isEmpty(this.type)){
--
Gitblit v1.9.1