From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
index 901ed35..54bbc4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRuleItem.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.system.service.DictDataService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -159,18 +162,13 @@
public String getWkType$(){
if (null == this.wkType){ return null; }
- switch (this.wkType){
- case "1":
- return " 甯搁噺";
- case "2":
- return " 娴佹按鍙�";
- case "3":
- return " 鏃ユ湡";
- case "4":
- return " 涓氬姟瀛楁 ";
- default:
- return String.valueOf(this.wkType);
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode,"sys_rule_item_type").eq(DictData::getValue, this.wkType));
+ if (null != dictData){
+ return dictData.getLabel();
}
+ return String.valueOf(this.wkType);
}
public String getStatus$(){
--
Gitblit v1.9.1