From 438d8954dfb9d9f262d3e11594266a51e9f0dd5b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 10:03:27 +0800
Subject: [PATCH] Func中添加时间戳转Date方法parse(查询数据库取到的是时间戳)。

---
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 55b4ed4..e38bdf8 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -2,7 +2,9 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.vci.base.common.utility.ObjectUtility;
+import com.vci.client.common.providers.ServiceProvider;
 import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.qtm.QTInfo;
 import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
 import com.vci.mw.client.InvocationUtility;
 import com.vci.starter.web.annotation.Column;
@@ -19,6 +21,7 @@
 import com.vci.web.pageModel.*;
 import com.vci.web.properties.WebProperties;
 import com.vci.web.service.*;
+import com.vci.web.util.Func;
 import com.vci.web.util.PlatformClientUtil;
 import com.vci.web.util.WebUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -140,7 +143,6 @@
 			});
 		}
 	}
-
 
 	/**
 	 * 鍒濆鍖栦笟鍔$被鍨�
@@ -465,7 +467,6 @@
 		return checkDataExsitByColumn(btmName,columnName,Arrays.asList(columnValues.split(",")));
 	}
 
-
 	/**
 	 * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇笟鍔$被鍨嬩笅鐨勬暟鎹�
 	 * @param btmType 涓氬姟绫诲瀷鐨勫悕绉帮紝浼氳嚜鍔ㄥ彉鎴愬皬鍐�
@@ -639,8 +640,8 @@
 			}
 			queryLcStatus(allCbos);
 		} catch (VCIError e) {
-//			logger.error(e.error_code,e);
-//			throw WebUtil.getVciBaseException(e);
+		// logger.error(e.error_code,e);
+		// hrow WebUtil.getVciBaseException(e);
 		}
 		return allCbos;
 	}
@@ -942,14 +943,15 @@
 		QueryTemplate qt = null;
 		try{
 			VciBaseUtil.alertNotNull(name,"鏌ヨ妯℃澘鐨勫悕绉�");
-			QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name);
+			// QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name);
+			QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(name);
 			qt = Tool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), name);
 			//鍥犱负涔嬪墠骞冲彴鐨凾ool.replaceQTValues 娌℃湁澶勭悊 ${xxx}銆傦紝 涓轰簡蹇界暐澶у皬鍐欙紝鎴戜滑杩欓噷鍗曠嫭澶勭悊 weidy@2021-3-10
 			//鎴戜滑杞崲涓哄皬鍐�
 			Condition condition = qt.getCondition();
 			Map<String,String> replaceLowMap = new HashMap<>();
 			if(condition !=null && condition.getCIMap()!=null){
-				Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap();
+				// Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap();
 				if(!CollectionUtils.isEmpty(replaceMap)){
 					replaceMap.forEach((key,value)->{
 						replaceLowMap.put(key.toLowerCase(),value);
@@ -963,7 +965,7 @@
 						if(StringUtils.isNotBlank(value)){
 							if(value.contains("#")){
 								//绯荤粺鍙橀噺.鏀寔涓�涓�
-								lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),""));
+								//lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),""));
 							}else if(value.contains("${")){
 								//鏈�${xxxx}鐨勬柟寮�
 								if(!CollectionUtils.isEmpty(replaceLowMap)) {
@@ -981,8 +983,8 @@
 				});
 			}
 		}catch(VCIError e){
-//			logger.error(e.error_code,e);
-//			throw WebUtil.getVciBaseException(e);
+			//logger.error(e.error_code,e);
+			//throw WebUtil.getVciBaseException(e);
 		} catch (DocumentException e) {
 			logger.error("鏌ヨ妯℃澘杞崲",e);
 			throw new VciBaseException(this.msgCodePrefix + "qtError", new Object[]{name});

--
Gitblit v1.9.3