From 0a2013ac0a8356c4bdbc44ba05e622b54d9bebed Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 15 十二月 2023 17:22:38 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java
index 1822cd3..c1b2726 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/utils/GetShowDictList.java
@@ -15,20 +15,30 @@
@Service
public class GetShowDictList {
@Autowired
- private SysDictTypeService sysDictTypeService;
+ private SysDictTypeService sysDictTypeService;
- public String getShowDictList(String values, String DictTYpe) {
- List<DictDto> userDicts = sysDictTypeService.getUserDicts();
- DictDto testType1Dict = userDicts.stream()
- .filter(c -> c.getDictType().equals(DictTYpe))
- .collect(Collectors.toList()).get(0);
- values = "," + values + ",";
+ public String getShowDictList(Object paramValues, String DictTYpe, Boolean enter) {
String result = "";
- for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
- String value = dictItemDto.getDictValue();
- String desc = (values.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
- result = result + desc;
+ if (paramValues != null) {
+ List<DictDto> userDicts = sysDictTypeService.getUserDicts();
+ DictDto testType1Dict = userDicts.stream()
+ .filter(c -> c.getDictType().equals(DictTYpe))
+ .collect(Collectors.toList()).get(0);
+
+ String values = "," + paramValues.toString() + ",";
+ int i = 0;
+ for (DictItemDto dictItemDto : ((DictLeafDto) testType1Dict).getDataList()) {
+ String value = dictItemDto.getDictValue();
+ String desc = (values.contains("," + value + ",") ? "鈽�" : "鈻�") + dictItemDto.getDictLabel();
+ i++;
+ if (enter && i < ((DictLeafDto) testType1Dict).getDataList().size()) {
+ desc = desc + "\r\n";
+ }
+ result = result + desc;
+ }
}
return result;
}
+
+
}
--
Gitblit v1.9.1