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);
         //因为之前平台的Tool.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});