From 1badfb47887a8b95e422341fb7b44f1610cae11b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 七月 2025 20:16:36 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 8f573db..91ee28e 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -199,9 +200,13 @@
if (Cools.isEmpty(this.exceStatus)){
return "";
}
+ String exceType = DictTypeCode.DICT_ASN_EXCE_STATUS;
+ if (this.type.equals(OrderType.ORDER_CHECK.type)) {
+ exceType = DictTypeCode.SYS_CHECK_EXCE_STATUS;
+ }
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS)
+ .eq(DictData::getDictTypeCode, exceType)
.eq(DictData::getValue, this.exceStatus));
if (Objects.isNull(dictData)) {
return null;
@@ -209,6 +214,7 @@
return dictData.getLabel();
}
+
public String getType$(){
if (Cools.isEmpty(this.type)){
return "";
--
Gitblit v1.9.1