From 787eeb2b2880490bcf2705dc8d35c9dd230dba35 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:44:39 +0800
Subject: [PATCH] 本地代码提交
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java | 18 +++++++++++++++++-
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java | 9 ++-------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java | 2 +-
5 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
index 97ba2d2..7c14a7a 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
@@ -52,7 +52,7 @@
private String templateType = "";
/**
- * 鏄剧ず绫诲瀷
+ * 婧愬璞★紙閫夋嫨鐨勪笟鍔＄被鍨嬶級
*/
private String showType = "";
@@ -97,11 +97,6 @@
private String expandMode = "";
/**
- * 涓氬姟绫诲瀷
- */
- //private String btmType = "";
-
- /**
* 閾炬帴绫诲瀷
*/
private String linkType = "";
@@ -137,7 +132,7 @@
private String showContentTable = "";
/**
- * 瀵艰埅鏍戠被鍨� 1浠ｈ〃folder 2浠ｈ〃瑙掕壊 3浠ｈ〃涓嶆樉绀�
+ * 瀵艰埅鏍戠被鍨� 1浠ｈ〃涓嶆樉绀� 2浠ｈ〃瑙掕壊 3浠ｈ〃folder
*/
private String navigatorType = "";
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java
index 5b1defd..68c5fba 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java
@@ -1,6 +1,8 @@
package com.vci.web.query;
+import com.alibaba.fastjson.JSON;
import com.vci.starter.web.pagemodel.BaseQueryObject;
+import com.vci.web.util.Func;
import java.util.ArrayList;
import java.util.HashMap;
@@ -59,7 +61,21 @@
}
public void setSourceData(Map<String, Object> sourceData) {
- this.sourceData = sourceData;
+ // TODO: 2024/12/2 Ludc 鐣岄潰浼犺繃鏉ョ殑Map鐨剉alue鍙兘鏄竴涓狹ap锛屾墍浠ュ皾璇曡浆鎹�
+ Map<String, Object> convertMap = new HashMap<>();
+ sourceData.keySet().stream().forEach(key->{
+ Object obj = sourceData.get(key);
+ try {
+ if(Func.isNotEmpty(obj)){
+ convertMap.put(key,JSON.parseObject(obj.toString(), HashMap.class));
+ }
+ }catch (Exception e){
+ //涓嶆姏鍑哄紓甯革紝濡傛灉杞殑鏃跺�欐姤閿欏氨浠ｈ〃鏄疭tring:String绫诲瀷锛岀洿鎺ュ線Map閲岄潰鏀�
+ convertMap.put(key,obj);
+ //e.printStackTrace();
+ }
+ });
+ this.sourceData = convertMap;
}
public List<Map<String, String>> getSelectData() {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 3243e99..cf129dd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -460,7 +460,7 @@
});
attrVOs = finalAttrVOs;
}
- //// TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
+ // TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
return attrVOs.stream().sorted(Comparator.comparing(o->o.getId(),String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
index 3bfea3b..518e1a5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
@@ -220,7 +220,7 @@
qtInfoDTO.setCreateTimeText(DateFormatUtils.format(new Date(obj.createTime), DateUtil.PATTERN_DATETIME));
dtos.add(qtInfoDTO);
}
- //// TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
+ // TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
dtos = dtos.stream().sorted(Comparator.comparing(QTInfoDTO::getQtName,String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
return BaseResult.dataList(dtos);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 52e0be9..be7701a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -379,7 +379,7 @@
statePool.oid = statusDTO.getOid();
statePool.id = "";
statePool.name = statusDTO.getId();
- //statePool.imagePath = statusDTO.getImagePath();
+ statePool.imagePath = statusDTO.getImagePath();
statePool.description = statusDTO.getDescription()==null?"":statusDTO.getDescription();
String userId = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
long now = VciDateUtil.getNowTime();
--
Gitblit v1.9.3