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/SerialRule.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
index 329be84..5be7630 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -4,6 +4,8 @@
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 lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -173,18 +175,13 @@
public String getReset$(){
if (null == this.reset){ return null; }
- switch (this.reset){
- case "year":
- return " 骞�";
- case "month":
- return " 鏈�";
- case "dd":
- return " 澶�";
- case "non":
- return " 鏃�";
- default:
- return String.valueOf(this.reset);
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode,"sys_rule_type").eq(DictData::getValue, this.reset));
+ if (null != dictData){
+ return dictData.getLabel();
}
+ return String.valueOf(this.reset);
}
public String getStatus$(){
--
Gitblit v1.9.1