From 744171debef6aee198be296520f0b86dc1586723 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 02 八月 2023 20:02:08 +0800
Subject: [PATCH] 提交代码

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |  202 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 164 insertions(+), 38 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index eb7a13d..5871992 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -5,24 +5,21 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
 import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
 import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
 import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
 import com.vci.ubcs.code.dto.CodeOrderDTO;
 import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
 import com.vci.ubcs.code.entity.*;
 import com.vci.ubcs.code.enumpack.*;
-import com.vci.ubcs.code.mapper.CodeWupinMapper;
 import com.vci.ubcs.code.mapper.CommonsMapper;
 import com.vci.ubcs.code.service.*;
 import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
+import com.vci.ubcs.code.vo.CodeReferConfigVO;
 import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
 import com.vci.ubcs.code.vo.pagemodel.UITablePageVO;
 import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.ubcs.flow.core.entity.ProcessStageAttr;
 import com.vci.ubcs.flow.core.feign.IMDMIFlowAttrClient;
 import com.vci.ubcs.flow.core.vo.ProcessStageAttrVO;
 import com.vci.ubcs.omd.constant.BtmTypeLcStatusConstant;
@@ -41,7 +38,6 @@
 import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
 import com.vci.ubcs.starter.web.constant.RegExpConstant;
-import com.vci.ubcs.starter.web.constant.VciSystemVarConstants;
 import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
 import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
 import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
@@ -95,7 +91,7 @@
  * @date 2022-2-22
  */
 @Service
-public class MdmEngineServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupin> implements MdmEngineService {
+public class MdmEngineServiceImpl implements MdmEngineService {
 
 
     /**
@@ -103,7 +99,6 @@
      */
     @Resource
     private CodeClstemplateServiceImpl templateService;
-
 
     /**
      * 鐢熸垚缂栫爜鐨勬湇鍔�
@@ -186,7 +181,8 @@
     CommonsMapper commonsMapper;
 
     @Resource
-    CodeWupinMapper codeWupinMapper;
+	ICodeBasicSecService codeBasicSecService;
+
     /**
      * 缂栫爜瑙勫垯鐨勬湇鍔�
      */
@@ -358,8 +354,6 @@
         if (baseModels.size() == 0) {
             throw new VciBaseException("鏈煡璇㈠埌鐩稿叧鏁版嵁銆�");
         }
-        // 寰呭畬鍠�
-        List<BtmTypeVO> cboList = null;  // btmTypeClient.selectList(wrapper);
         //杩橀渶瑕佷慨鏀筧llCode鐨勭敓鍛藉懆鏈�
 //		Map<String, String> conditionMap = new HashMap<>();
         QueryWrapper<CodeAllCode> allCodeWrapper = new QueryWrapper<>();
@@ -375,19 +369,19 @@
             if (!listR.isSuccess() || listR.getData().size() == 0) {
                 throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
             }
-            commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
+			// 鐩存帴鍒犻櫎锛屼笉缁欑姸鎬�
+			commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
+			// commonsMapper.updateByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()),CodeDefaultLC.TASK_BACK.getValue());
         } else {
             for (BaseModel baseModel : baseModels) {
                 baseModel.setLcStatus(baseModelDTO.getLcStatus());
             }
             updateBatchByBaseModel(baseModelDTO.getBtmname(), baseModels);
-            // lifeCycleService.transCboStatus(cboList, baseModelDTO.getLcStatus());
         }
         for (CodeAllCode codeCbo : codeCbos) {
             codeCbo.setLcStatus(baseModelDTO.getLcStatus());
         }
         codeAllCodeService.updateBatchById(codeCbos);
-        // lifeCycleService.transCboStatus(codeCbos, baseModelDTO.getLcStatus());
     }
 
     /**
@@ -426,10 +420,13 @@
 //		//璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
         copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
 		cbo.setOid(VciBaseUtil.getPk());
+		cbo.setRevisionOid(VciBaseUtil.getPk());
+		cbo.setNameOid(VciBaseUtil.getPk());
 		cbo.setCreateTime(new Date());
 		cbo.setLastModifyTime(new Date());
 		cbo.setCreator(AuthUtil.getUser().getUserName());
 		cbo.setLastModifier(AuthUtil.getUser().getUserName());
+		cbo.setTenantId(AuthUtil.getTenantId());
 //		//TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
         cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
 //		//end -- modify by lihang @20220407
@@ -740,7 +737,7 @@
                 conditionMap.put(queryKey, queryValue);
             } else {
                 //涓虹┖鐨勬椂鍊欎笉浠h〃涓嶆牎楠岋紝鍙槸涓嶅幓闄ょ浉鍏崇殑淇℃伅
-                conditionMap.put("t." + attrId, value);
+                conditionMap.put("t." + attrId, "'" +value+ "'");
             }
         }
     }
@@ -944,6 +941,26 @@
         }
     }
 
+	/**
+	 * 灏佽寮�鍏崇殑鍐呭锛屽父鐢ㄤ簬瀵煎嚭
+	 * @param dataMap 鏁版嵁鐨勫唴瀹�
+	 * @param templateVO 妯℃澘鐨勬樉绀�
+	 */
+	@Override
+	public void wrapperBoolean(List<Map<String, String>> dataMap, CodeClassifyTemplateVO templateVO){
+		List<String> booleanAttributes = templateVO.getAttributes().stream().filter(s -> VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(s.getAttributeDataType())).map(s -> s.getId().toLowerCase(Locale.ROOT)).collect(Collectors.toList());
+		if(!CollectionUtils.isEmpty(booleanAttributes)){
+			dataMap.stream().forEach(data -> {
+				booleanAttributes.stream().forEach(attrId->{
+					if(data.containsKey(attrId)){
+						String value = data.get(attrId);
+						data.put(attrId,BooleanEnum.TRUE.getValue().equalsIgnoreCase(value)?"鏄�":"鍚�");
+					}
+				});
+			});
+		}
+	}
+
     @Override
     public MdmUIInfoVO getFormDefineByTemplateOid(String templateOid, String codeClassifyOid) {
         CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(templateOid);
@@ -1096,8 +1113,9 @@
             itemVO.setType("refer");
             itemVO.setShowField(itemVO.getField() + "name");
             if (StringUtils.isNotBlank(attrVO.getReferConfig())) {
-                //閰嶇疆鐨勫唴瀹�
-                itemVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
+                // 閰嶇疆鐨勫唴瀹�
+                // itemVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
+				itemVO.setReferConfig(referConfigToUIUiTable(attrVO.getReferConfig()));
             } else {
                 UIFormReferVO formReferVO = new UIFormReferVO();
                 formReferVO.setType("default");
@@ -1211,7 +1229,8 @@
             fieldVO.setShowField(fieldVO.getField());
             if (StringUtils.isNotBlank(attrVO.getReferConfig())) {
                 //閰嶇疆鐨勫唴瀹�
-                fieldVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
+                // fieldVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
+				fieldVO.setReferConfig(referConfigToUIUiTable(attrVO.getReferConfig()));
             } else {
                 UIFormReferVO formReferVO = new UIFormReferVO();
                 formReferVO.setType("default");
@@ -1244,6 +1263,51 @@
         return fieldVO;
     }
 
+	/**
+	 * 灏唕eferconfig杞崲涓篔SON鏍煎紡鐨刄IFormReferVO
+	 * @param codeReferConfigVO
+	 * @return
+	 */
+	private UIFormReferVO referConfigToUIUiTable(String codeReferConfigVO){
+		CodeReferConfigVO codeReferConfig = JSONObject.parseObject(codeReferConfigVO, CodeReferConfigVO.class);
+		// 鎷疯礉涓轰互鍓嶇殑鑰佸璞�
+		UIFormReferVO uiFormReferVO = new UIFormReferVO();
+		org.springblade.core.tool.utils.BeanUtil.copy(codeReferConfig,uiFormReferVO);
+
+		// 琛ㄦ牸鐨勮嚜瀹氫箟瀹氫箟
+		UITableCustomDefineVO uiTableConfigVO = new UITableCustomDefineVO();
+		uiTableConfigVO.setPage(new UITablePageVO(codeReferConfig.getLimit(),1));
+		// 鍒楄〃鐨勫垪鐨勪俊鎭浆鎹�
+		List<UITableFieldVO> uiTableFieldVOs = new ArrayList<>();
+		// 蹇�熸煡璇㈠垪
+		List<UITableFieldVO> queryColumns = new ArrayList<>();
+		if(!CollectionUtils.isEmpty(codeReferConfig.getCodeShowFieldConfigVOS())){
+			codeReferConfig.getCodeShowFieldConfigVOS().stream().forEach(showField ->{
+				UITableFieldVO tableColVO = new UITableFieldVO();
+				org.springblade.core.tool.utils.BeanUtil.copy(showField,tableColVO);
+				tableColVO.setSortField(showField.getAttrSortField());
+				uiTableFieldVOs.add(tableColVO);
+				if(showField.getIsQuery().equals("true")){
+					queryColumns.add(tableColVO);
+				}
+			});
+		}
+		// 鏄剧ず鐨勫垪
+		uiTableConfigVO.setCols(uiTableFieldVOs);
+		// 蹇�熸煡璇㈠垪
+		uiTableConfigVO.setQueryColumns(queryColumns);
+		//set缁欒〃鏍奸厤缃睘鎬�
+		uiFormReferVO.setTableConfig(uiTableConfigVO);
+		// 绛涢�夋潯浠�
+		HashMap<String, String> whereMap = new HashMap<>();
+		if(!codeReferConfig.getCodeSrchCondConfigVOS().isEmpty()){
+			codeReferConfig.getCodeSrchCondConfigVOS().stream().forEach(srch->{
+				whereMap.put(srch.getFilterField()+srch.getFilterType(),srch.getFilterValue());
+			});
+		}
+		uiFormReferVO.setWhere(whereMap);
+		return uiFormReferVO;
+	}
 
     /**
      * 鐩镐技椤规煡璇�
@@ -1389,7 +1453,16 @@
     public DataGrid<Map<String, String>> queryGrid(String btmType, CodeClassifyTemplateVO templateVO, Map<String, String> conditionMap, PageHelper pageHelper) {
         CodeTemplateAttrSqlBO sqlBO = getSqlByTemplateVO(btmType, templateVO, conditionMap, pageHelper);
 //		List<Map> maps = boService.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
-        List<Map<String, String>> maps = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
+		List<Map<String, String>> maps = null;
+		try {
+			maps = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
+		}catch (Exception e){
+			String errorMessage = e.getMessage();
+			if (errorMessage.contains("鏃犳硶瑙f瀽鐨勬垚鍛樿闂〃杈惧紡")) {
+				throw new ServiceException("缂哄皯"+errorMessage.substring(errorMessage.indexOf("[t.") + 1, errorMessage.indexOf("]"))+"瀛楁");
+			}
+			throw new ServiceException(e.getMessage());
+		}
 
         DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
         List<Map<String, String>> dataList = new ArrayList<>();
@@ -1397,7 +1470,7 @@
             maps.stream().forEach(map -> {
                 Map<String, String> data = new HashMap<>();
                 for (String s : map.keySet()) {
-                    data.put(s.toLowerCase(Locale.ROOT), String.valueOf(map.get(s)));
+                    data.put(s.toLowerCase(Locale.ROOT), map.get(s)==null?null:String.valueOf(map.get(s)));
                 }
 //				map.forEach((key, value) -> {
 //					data.put(((String) key).toLowerCase(Locale.ROOT), String.valueOf(value));
@@ -2004,7 +2077,7 @@
         }
         R<BtmTypeVO> r = btmTypeClient.getDefaultAttrByBtmId(btmType);
         List<BtmTypeAttributeVO> attributes = r.getData().getAttributes();
-        if (r.getCode() != 200 || attributes.isEmpty()) {
+        if (!r.isSuccess() || attributes.isEmpty()) {
             return false;
         }
         return attributes.stream().anyMatch(item -> item.getId().equals(selectKey));
@@ -2025,13 +2098,21 @@
             sql.append("t.");
         }
         if (value.startsWith(QueryOptionConstant.IN)) {
-            sql.append(selectKey)
+            if(value.startsWith(QueryOptionConstant.IN+"('") && value.endsWith("')")){
+				sql.append(selectKey)
+					.append(SPACE)
+					.append("in")
+					.append(SPACE)
+					.append(value.replace(QueryOptionConstant.IN, ""));
+			}else{
+				sql.append(selectKey)
                     .append(SPACE)
                     .append("in")
                     .append(SPACE)
                     .append("(")
                     .append(value.replace(QueryOptionConstant.IN, ""))
                     .append(")");
+			}
         } else if (value.startsWith(QueryOptionConstant.NOTIN)) {
             sql.append(selectKey)
                     .append(SPACE)
@@ -2320,7 +2401,7 @@
 //			conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)
 
             conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " +
-                    btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY))
+                    btmTypeClient.selectByIdCollection(Collections.singletonList("classify"))
                             .getData().get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
                     .FRAMEWORK_DATA_ENABLED + "' start with parentCodeClassifyOid = '" + codeClassifyOid +
                     "' CONNECT BY PRIOR OID = parentCodeClassifyOid )");
@@ -2670,7 +2751,7 @@
         cbosB.stream().forEach(map -> {
             Map<String, String> data = new HashMap<>();
             for (Object o : map.keySet()) {
-                data.put(((String) o).toLowerCase(Locale.ROOT), String.valueOf(map.get(o)));
+                data.put(((String) o).toLowerCase(Locale.ROOT), map.get(o)==null?"":String.valueOf(map.get(o)));
             }
             cbos.add(data);
         });
@@ -3259,7 +3340,7 @@
 			throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲瀛楁淇℃伅锛岃妫�鏌ワ紒");
 		}
 		Set<String> existFild = allAttributeByBtmId.getData().getAttributes().stream().map(btmTypeAttributeVO -> {
-			return btmTypeAttributeVO.getId();
+			return btmTypeAttributeVO.getId().toLowerCase();
 		}).collect(Collectors.toSet());
 		//灏哹ean杞负map,mybatis缁熶竴澶勭悊
         List<Map<String, String>> maps = new ArrayList<>();
@@ -3316,13 +3397,17 @@
                             setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue());
                             map.remove(property.getName().toUpperCase());
                         } else if (map.get(property.getName().toUpperCase()) != null) {
-                            setter.invoke(obj, map.get(property.getName().toUpperCase()));
+							if(setter.getParameterTypes()[0].getSimpleName().equals("String")){
+								setter.invoke(obj, String.valueOf(map.get(property.getName().toUpperCase())));
+							}else{
+								setter.invoke(obj, map.get(property.getName().toUpperCase()));
+							}
                             map.remove(property.getName().toUpperCase());
                         }
                     }
                 }
                 for (Object key : map.keySet()) {
-                    map.put(key, String.valueOf(map.get(key)));
+                    map.put(key, map.get(key) == null ? null : String.valueOf(map.get(key)));
                 }
 
                 ((BaseModel) obj).setData(map);
@@ -3346,7 +3431,7 @@
         if (!listR.isSuccess() || listR.getData().size() == 0) {
             throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
         }
-        String userName = String.valueOf(AuthUtil.getUser().getUserId());
+//        String userName = String.valueOf(AuthUtil.getUser().getUserId());
         BaseModel bo = new BaseModel();
 //		bo.setOid(VciBaseUtil.getPk());
 //		bo.setRevisionid(VciBaseUtil.getPk());
@@ -3356,16 +3441,16 @@
         bo.setFirstR("1");
         bo.setFirstV("1");
         bo.setLastV("1");
-        bo.setCreator(userName);
-        bo.setCreateTime(new Date());
-        bo.setLastModifier(userName);
-        bo.setLastModifyTime(new Date());
         bo.setRevisionRule(listR.getData().get(0).getRevisionRuleId());
-        bo.setVersionRule(String.valueOf(listR.getData().get(0).getVersionRule()));
+        bo.setVersionRule("".equals(listR.getData().get(0).getVersionRule())?"0":listR.getData().get(0).getVersionRule());
         if (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId())) {
             R<List<RevisionRuleVO>> revisionRuleVO = revisionRuleClient
-                    .selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId()));
-            bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
+                    .selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId().toLowerCase()));
+            if(revisionRuleVO.getData().size() != 0 ){
+				bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
+			}else{
+				bo.setRevisionValue("1");
+			}
         }
         bo.setRevisionSeq(1);
         bo.setVersionSeq(1);
@@ -3378,7 +3463,7 @@
         bo.setId("");
         bo.setName("");
         bo.setDescription("");
-        bo.setOwner(userName);
+        bo.setOwner("1");
 //		bo.setCheckinby(userName);
         bo.setCopyFromVersion("");
 //		this.initTypeAttributeValue(bo,btmTypeVO);
@@ -3455,7 +3540,7 @@
         //checkReferConfig(referConfigVO);
         //浣跨敤涓氬姟绫诲瀷鏌ヨ
         R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
-        if (allAttributeByBtmId.getCode() != 200) {
+        if (!allAttributeByBtmId.isSuccess()) {
             throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
         }
         if (Func.isEmpty(allAttributeByBtmId.getData())) {
@@ -3477,7 +3562,7 @@
         }
 
         R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referConfigVO.getReferType()));
-        if (listR.getCode() != 200) {
+        if (!listR.isSuccess()) {
             throw new ServiceException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg() : "涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
         }
         if (listR.getData().isEmpty()) {
@@ -3633,7 +3718,48 @@
         } else {
             if (StringUtils.isNotBlank(referConfigVO.getParentFieldName()) && StringUtils.isNotBlank(queryObject.getParentOid())) {
                 queryObject.getConditionMap().put(referConfigVO.getParentFieldName(), queryObject.getParentOid());
-            }
+				//鏌ヨ鍏ㄩ儴鐨勪俊鎭�
+				String parentOidSql = "";
+				if (StringUtils.isNotBlank(referConfigVO.getParentValue())) {
+					String temp = referConfigVO.getParentValue();
+					if (temp.startsWith(QueryOptionConstant.IN)) {
+						temp = temp.substring((QueryOptionConstant.IN).length()).trim();
+						parentOidSql = " in " + "('" + queryObject.getParentOid() + "')";
+					} else if (temp.startsWith(QueryOptionConstant.NOTIN)) {
+						parentOidSql = " not in " + "('" + queryObject.getParentOid() + "')";
+					} else if (temp.startsWith(QueryOptionConstant.NOTEQUAL)) {
+						temp = temp.substring((QueryOptionConstant.NOTEQUAL).length()).trim();
+						parentOidSql = QueryOptionConstant.NOTEQUAL + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
+					} else if (temp.startsWith(QueryOptionConstant.MORETHAN)) {
+						temp = temp.substring((QueryOptionConstant.MORETHAN).length()).trim();
+						parentOidSql = QueryOptionConstant.MORETHAN + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
+					} else if (temp.startsWith(QueryOptionConstant.MORE)) {
+						temp = temp.substring((QueryOptionConstant.MORE).length()).trim();
+						parentOidSql = QueryOptionConstant.MORE + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
+					} else if (temp.startsWith(QueryOptionConstant.LESSTHAN)) {
+						temp = temp.substring((QueryOptionConstant.LESSTHAN).length()).trim();
+						parentOidSql = QueryOptionConstant.LESSTHAN + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
+					} else if (temp.startsWith(QueryOptionConstant.LESS)) {
+						temp = temp.substring((QueryOptionConstant.LESS).length()).trim();
+						parentOidSql = QueryOptionConstant.LESS + " " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
+					} else if (temp.startsWith(QueryOptionConstant.ISNOTNULL)) {
+						parentOidSql = " is not null";
+					} else if (temp.startsWith(QueryOptionConstant.ISNULL)) {
+						parentOidSql = " is  null";
+					} else if (temp.contains("*")) {
+						parentOidSql = " like " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'").replace("*", "%");
+					} else {
+						parentOidSql = " = " + ((temp.startsWith("'") && temp.endsWith("'")) ? temp : "'" + temp + "'");
+					}
+
+				}
+				//鏌ヨ鍏ㄩ儴鐨勪俊鎭�
+				queryObject.getConditionMap().put("oid", QueryOptionConstant.IN + "(select oid from " +
+					getTableName(referConfigVO.getReferType()) +
+					" START WITH " + referConfigVO.getParentFieldName() + " " +
+					parentOidSql +
+					" CONNECT BY PRIOR " + oidFieldName + " = " + referConfigVO.getParentFieldName() + ")");
+			}
         }
         LambdaQueryWrapper<CodeClassify> lqw = new LambdaQueryWrapper<>();
         String sql = queryObject.getConditionMap().get("oid").substring(3);

--
Gitblit v1.9.3