From 73dbe864eb18a1a4df4f41caed1dd128faf1b2ec Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 02 六月 2023 19:11:27 +0800
Subject: [PATCH] 引用码段关于业务类型接口的联调，重复使用的界面抽离成单独组件
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 280 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 210 insertions(+), 70 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index f26c5de..1740d98 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -2,53 +2,58 @@
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.vci.ubcs.code.bo.TreeWrapperOptions;
+import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.entity.CodeClstemplateEntity;
-import com.vci.ubcs.code.entity.CodeOsbtmtypeEntity;
-import com.vci.ubcs.code.entity.CodeOsbtmtypeattributeEntity;
+import com.vci.ubcs.code.entity.CodeClassifyTemplate;
import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
import com.vci.ubcs.code.mapper.CodeClassifyMapper;
-import com.vci.ubcs.code.mapper.CodeClstemplateMapper;
-import com.vci.ubcs.code.mapper.CodeOsbtmtypeMapper;
-import com.vci.ubcs.code.mapper.CodeOsbtmtypeattributeMapper;
+import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper;
import com.vci.ubcs.code.po.CodeClassifyPO;
import com.vci.ubcs.code.service.ICodeClassifyService;
-import com.vci.ubcs.code.service.ICodeKeyattrrepeatService;
+import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
import com.vci.ubcs.code.service.ICodeRuleService;
-import com.vci.ubcs.code.vo.CodeOsattributeVO;
-import com.vci.ubcs.code.vo.CodeOsbtmtypeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import com.vci.ubcs.code.vo.pagemodel.TreeQueryObject;
-import com.vci.ubcs.com.vci.starter.bo.WriteExcelData;
-import com.vci.ubcs.com.vci.starter.exception.VciBaseException;
-import com.vci.ubcs.com.vci.starter.poi.bo.ReadExcelOption;
-import com.vci.ubcs.com.vci.starter.poi.bo.WriteExcelOption;
-import com.vci.ubcs.com.vci.starter.poi.constant.ExcelLangCodeConstant;
-import com.vci.ubcs.com.vci.starter.poi.util.ExcelUtil;
-import com.vci.ubcs.com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.ubcs.com.vci.starter.util.LocalFileUtil;
-import com.vci.ubcs.com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.com.vci.starter.web.pagemodel.Tree;
-import com.vci.ubcs.com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.ubcs.com.vci.starter.web.util.LangBaseUtil;
-import com.vci.ubcs.com.vci.starter.web.util.VciBaseUtil;
-import org.springblade.core.log.exception.ServiceException;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
+import com.vci.ubcs.omd.feign.IBtmTypeClient;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.starter.bo.WriteExcelData;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.poi.bo.ReadExcelOption;
+import com.vci.ubcs.starter.poi.bo.WriteExcelOption;
+import com.vci.ubcs.starter.poi.constant.ExcelLangCodeConstant;
+import com.vci.ubcs.starter.poi.util.ExcelUtil;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
+import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.util.BladeTreeQueryObject;
+import com.vci.ubcs.starter.util.LocalFileUtil;
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
+import com.vci.ubcs.starter.web.util.LangBaseUtil;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -66,15 +71,13 @@
private CodeClassifyMapper codeClassifyMapper;
@Resource
- private CodeClstemplateMapper codeClstemplateMapper;
+ private CodeClassifyTemplateMapper codeClassifyTemplateMapper;
@Resource
private ICodeRuleService codeRuleService;
@Resource
- private CodeOsbtmtypeMapper codeOsbtmtypeMapper;
- @Resource
- CodeOsbtmtypeattributeMapper codeOsbtmtypeattributeMapper;
+ private IBtmTypeClient btmTypeClient;
/**
* 鏃ュ織
@@ -87,7 +90,7 @@
private RevisionModelUtil revisionModelUtil;
@Resource
- private ICodeKeyattrrepeatService iCodeKeyattrrepeatService;
+ private ICodeKeyAttrRepeatService iCodeKeyattrrepeatService;
/**
* 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
*/
@@ -255,7 +258,6 @@
return codeClassifyMapper.checkHasChild(oid.trim());
}
-
/**
* 鍒犻櫎涓婚搴撳垎绫�
* @param codeClassify 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
@@ -274,7 +276,7 @@
//鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
Map<String,Object> condition = new HashMap<>(2);
condition.put("codeClassifyOid",codeClassify.getOid());
- List<CodeClstemplateEntity> codeClstemplateEntities = codeClstemplateMapper.selectByMap(condition);
+ List<CodeClassifyTemplate> codeClstemplateEntities = codeClassifyTemplateMapper.selectByMap(condition);
// VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateDO.class);
// queryWrapper.addQueryMap("codeClassifyOid",codeClassifyDTO.getOid());
// List<CodeClassifyTemplateDO> codeClassifyTemplateDOListHaveTemplate = codeClassifyTemplateMapper.selectByWrapper(queryWrapper);
@@ -298,7 +300,8 @@
//2銆佹煡璇㈣鍒犻櫎鐨勫瓙绫绘暟鎹�
List<CodeClassify> codeClassifyDOList = codeClassifyMapper.selectBatchIds(s);
deletes.addAll(codeClassifyDOList);
- codeClassifyMapper.deleteBatchIds(s);
+// codeClassifyMapper.deleteBatchIds(s);
+ baseMapper.deleteBatchIds(s);
}
}
@@ -359,7 +362,6 @@
return codeClassifyDO2VOs(codeClassifyDOList);
}
-
/**
* 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
* @param oidCollections 涓婚敭鐨勯泦鍚�
@@ -378,7 +380,6 @@
}
return codeClassifyList;
}
-
/**
* 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
@@ -466,8 +467,45 @@
return tree;
}
+ /**
+ * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
+ *
+ * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
+ * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄
+ */
+ @Override
+ public List<CodeClassifyVO> selectCodeClassifyDOByTree(TreeQueryObject treeQueryObject) {
+ List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid());
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
+ }
+ /**
+ * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
+ *
+ * @param fieldPath 缂栧彿鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
+ * @return 鍒嗙被鐨勬樉绀哄璞�
+ */
+ @Override
+ public CodeClassifyVO getObjectByClsfNamePath(String fieldPath){
+ CodeClassifyVO codeClassifyVO=new CodeClassifyVO();
+ List<CodeClassify> classifyList = codeClassifyMapper.selectByFieldNamePath(fieldPath,"name");
+ if(classifyList.size()>0){
+ codeClassifyVO=codeClassifyDO2VO(classifyList.get(0));
+ }
+ return codeClassifyVO;
+ }
+ /***
+ * 鏍规嵁涓婄骇鑺傜偣鑾峰彇涓嬬骇鑺傜偣浠ｅ彿璺緞鍜屽悕绉拌矾寰�
+ * @param classifyId
+ * @param enable
+ * @return
+ */
+ @Override
+ public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
+ return null;
+ }
-// /**
+ // /**
// * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
// *
// * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
@@ -627,7 +665,6 @@
return excelName;
}
-
/**
* 瀵煎叆鍒嗙被
*
@@ -692,9 +729,10 @@
List<String> btmOids = poList.stream().filter(s -> StringUtils.isNotBlank(s.getKeyRepeatRuleId()))
.map(CodeClassifyPO::getBtmTypeId).collect(Collectors.toList());
- Map<String, CodeOsbtmtypeEntity> btmVOMap = Optional.ofNullable(btmOids.size()==0 ? null: codeOsbtmtypeMapper.selectBatchIds(btmOids)
- ).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
-// Map<String, CodeOsbtmtypeVO> btmVOMap = null;
+ Map<String, BtmTypeVO> btmVOMap = Optional
+ .ofNullable(btmOids.size()==0 ? null: btmTypeClient.selectByIdCollection(btmOids).getData())
+ .orElse(new ArrayList<BtmTypeVO>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
+ // Map<String, CodeOsbtmtypeVO> btmVOMap = null;
Map<String/**璺緞**/,String/**涓婚敭**/> oidPathMap = new HashMap<>();
//鎴戜滑闇�瑕佹煡璇㈡墍鏈夊凡缁忓瓨鍦ㄧ殑鍒嗙被锛屼富瑕佹槸璺緞锛岀敤鏉ュ垽鏂垎绫荤殑鏁版嵁
@@ -724,7 +762,7 @@
classify.setDescription(po.getDescription());
oidPathMap.put(po.getPath(),classify.getOid());
if(StringUtils.isNotBlank(po.getBtmTypeId())){
- CodeOsbtmtypeVO typeVO = (CodeOsbtmtypeVO)btmVOMap.get(po.getBtmTypeId().toLowerCase(Locale.ROOT));
+ BtmTypeVO typeVO = (BtmTypeVO)btmVOMap.get(po.getBtmTypeId().toLowerCase(Locale.ROOT));
classify.setBtmTypeId(typeVO.getId());
classify.setBtmTypeName(typeVO.getName());
}
@@ -835,7 +873,7 @@
* @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
*/
@Override
- public DataGrid<CodeOsattributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) {
+ public DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) {
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
@@ -843,9 +881,13 @@
baseQueryObject.setConditionMap(new HashMap<>());
}
String classifyOid = baseQueryObject.getConditionMap().getOrDefault("codeClassifyOid","");
+ String btmTypeOid = baseQueryObject.getConditionMap().getOrDefault("btmTypeOid","");
String id = baseQueryObject.getConditionMap().getOrDefault("id","");
String name = baseQueryObject.getConditionMap().getOrDefault("name","");
if(StringUtils.isBlank(classifyOid)){
+ return new DataGrid<>();
+ }
+ if(StringUtils.isBlank(btmTypeOid)){
return new DataGrid<>();
}
CodeClassifyVO topClassifyVO = getTopClassifyVO(classifyOid);
@@ -855,18 +897,20 @@
Map<String,Object> condition = new HashMap<>(1);
condition.put("pkbtmtype",topClassifyVO.getBtmtypeid());
-
- List<CodeOsbtmtypeattributeEntity> unDefaultAttributes = codeOsbtmtypeattributeMapper.selectByMap(condition);
-// List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
- List<CodeOsattributeVO> attributeVOS = new ArrayList<>();
+ BtmTypeVO data = btmTypeClient.getDetail(btmTypeOid).getData();
+ List<BtmTypeAttributeVO> unDefaultAttributes = data.getAttributes();
+ // List<CodeOsbtmtypeattributeEntity> unDefaultAttributes = codeOsbtmtypeattributeMapper.selectByMap(condition);
+ // List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
+ List<BtmTypeAttributeVO> attributeVOS = new ArrayList<>();
if(!CollectionUtils.isEmpty(unDefaultAttributes)){
unDefaultAttributes.stream().forEach(attr->{
- CodeOsattributeVO attributeVO = new CodeOsattributeVO();
+ BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
BeanUtils.copyProperties(attr,attributeVO);
- attributeVO.setAttributedatatype(attr.getAttrdatatype());
- attributeVO.setAttrlength(Short.valueOf(attr.getAttributelength()));
- attributeVO.setBtmtypeid(attr.getReferbtmtypeid());
- attributeVO.setBtmtypename(attr.getReferbtmtypename());
+ attributeVO.setAttrDataType(attr.getAttrDataType());
+ attributeVO.setAttributeLength(attr.getAttributeLength());
+ attributeVO.setBtmTypeId(data.getId());
+ attributeVO.setBtmname(data.getName());
+ attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,attr.getAttrDataType()));
boolean add = true;
if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
add = false;
@@ -879,21 +923,7 @@
}
});
}
-// if(!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())){
-// attributeService.getDefaultAttributeVOs().stream().forEach(attr->{
-// boolean add = true;
-// if(StringUtils.isNotBlank(id) && !attr.getId().contains(id.replace("*",""))){
-// add = false;
-// }
-// if(StringUtils.isNotBlank(name) && !attr.getId().contains(name.replace("*",""))){
-// add = false;
-// }
-// if(add){
-// attributeVOS.add(attr);
-// }
-// });
-// }
- DataGrid<CodeOsattributeVO> dataGrid = new DataGrid<>();
+ DataGrid<BtmTypeAttributeVO> dataGrid = new DataGrid<>();
dataGrid.setData(attributeVOS);
dataGrid.setTotal(attributeVOS.size());
return dataGrid;
@@ -952,6 +982,17 @@
}
/**
+ * 涓婚敭鑾峰彇涓婚搴撳垎绫�
+ * @param oid 涓婚敭
+ * @return 涓婚搴撳垎绫绘樉绀哄璞�
+ * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
+ */
+ @Override
+ public CodeClassifyVO getObjectByOid(String oid) throws VciBaseException{
+ return codeClassifyDO2VO(selectByOid(oid));
+ }
+
+ /**
* 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
*
* @param idPath 缂栧彿鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
@@ -968,7 +1009,7 @@
}
/**
- * 涓婚搴撶殑鏍�
+ * 涓婚搴撶殑鏍�,宸茶仈璋冧笟鍔＄被鍨嬫煡璇eign
*
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
* @return 涓婚搴撴樉绀烘爲
@@ -979,10 +1020,109 @@
treeQueryObject = new TreeQueryObject();
}
if(treeQueryObject.getConditionMap() == null){
- treeQueryObject.setConditionMap(new HashMap<>());
+ treeQueryObject.setConditionMap(new HashMap<String,String>());
}
treeQueryObject.getConditionMap().put(PARENT_FIELD_NAME, "=null");
- return treeCodeClassify(treeQueryObject);
+ List<Tree> trees = treeCodeClassify(treeQueryObject);
+ treeQueryObject.getConditionMap().put("domain", AppConstant.APPLICATION_NAME_CODE);
+ BaseQueryObject baseQueryObject = new BaseQueryObject();
+ baseQueryObject.setConditionMap(treeQueryObject.getConditionMap());
+ List<BtmTypeVO> btmTypeVOS = btmTypeClient.getRef(baseQueryObject).getData();
+ if(Func.isEmpty(btmTypeVOS) || Func.isEmpty(trees)){
+ return null;
+ }
+ List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
+ if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
+ tree.getAttributes().put("btmTypeOid",btmType.getOid());
+ return true;
+ }
+ return false;
+ }).collect(Collectors.toList())))
+ .collect(Collectors.toList());
+ return treeList;
+ }
+
+ /**
+ * 鑾峰彇杩欎釜鍒嗙被涓嬬殑涓氬姟绫诲瀷锛屽綋鍓嶆病鏈夊氨鑾峰彇涓婄骇鐨勭涓�涓笟鍔＄被鍨�
+ * @param oid 褰撳墠鍒嗙被鐨刼id
+ * @return oid,id,name,btmtypeid,btmtypename锛屾病鏈夊氨杩斿洖null
+ */
+ @Override
+ public CodeClassify selectBtmOrParentBtm(String oid){
+ List<CodeClassify> oidList = selectAllLevelParents(oid);
+ return oidList.size()==0?null:oidList.get(0);
+ }
+
+ /**
+ * 鑾峰彇鎵�鏈夊眰绾т笂绾у叧鑱斾笟鍔＄被鍨嬫暟鎹�
+ * @param oid 褰撳墠鍒嗙被鐨刼id
+ * @return oid,id,name,btmtypeid,btmtypename
+ */
+ @Override
+ public List<CodeClassify> selectAllLevelParents(String oid){
+// String sql = "select oid,id,name,btmtypeid,btmtypename from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY) + " where btmtypeid is not null start with oid= :oid connect by prior PARENTCODECLASSIFYOID=oid ";
+// Map< String,String> conditionMap = new HashMap< String,String>();
+// conditionMap.put("oid",oid);
+// List<Map> dataList = boService.queryBySqlForMap(sql,conditionMap);
+ List<Map<String, Object>> dataList = codeClassifyMapper.selectAllLevelParents(oid);
+ List<CodeClassify> oidList = new ArrayList<CodeClassify>();
+ if(!CollectionUtils.isEmpty(dataList)){
+ for(Map data:dataList){
+ CodeClassify codeClassifyDO = new CodeClassify();
+ codeClassifyDO.setOid(VciBaseUtil.getStringValueFromObject(data.get("OID")));
+ codeClassifyDO.setId(VciBaseUtil.getStringValueFromObject(data.get("ID")));
+ codeClassifyDO.setName(VciBaseUtil.getStringValueFromObject(data.get("NAME")));
+ codeClassifyDO.setBtmTypeId(VciBaseUtil.getStringValueFromObject(data.get("BTMTYPEID")));
+ codeClassifyDO.setBtmTypeName(VciBaseUtil.getStringValueFromObject(data.get("BTMTYPENAME")));
+ oidList.add(codeClassifyDO);
+ }
+ }
+ return oidList;
+ }
+
+ /**
+ * 浣跨敤鍒嗙被涓婚敭鑾峰彇鍒嗙被鐩稿叧鐨勬墍鏈変俊鎭�
+ *
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @return 鍒嗙被涓婄骇锛屼笅绾х殑淇℃伅
+ */
+ @Override
+ public CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid) {
+ VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
+ CodeClassifyFullInfoBO fullInfo = new CodeClassifyFullInfoBO();
+ CodeClassify classifyDO = selectByOid(codeClassifyOid);
+ //鏌ヨ涓婄骇
+ fullInfo.setCurrentClassifyVO(codeClassifyDO2VO(classifyDO));
+// List<Map<String, Object>> maps = codeClassifyMapper.selectAllLevelParentByOid(codeClassifyOid);
+// List<Map<String, Object>> maps = selectAllLevelParentByOid(codeClassifyOid);
+ List<CodeClassify> codeClassifyList = selectAllLevelParentByOid(codeClassifyOid);
+// for (Map<String, Object> map : maps) {
+// CodeClassify codeClassify = new CodeClassify();
+// codeClassify.setOid(String.valueOf(map.get("OID")));
+// codeClassify.setDataLevel((Integer) map.get("LEVEL"));
+// codeClassifyList.add(codeClassify);
+// }
+
+ fullInfo.setParentClassifyVOs(codeClassifyDO2VOs(codeClassifyList));
+ if(!CollectionUtils.isEmpty(fullInfo.getParentClassifyVOs())){
+ fullInfo.setTopClassifyVO(fullInfo.getParentClassifyVOs().stream().filter(s->StringUtils.isBlank(s.getParentcodeclassifyoid())).findFirst().orElseGet(()->null));
+ }
+ return fullInfo;
+ }
+
+ /**
+ * 缁熻瀛愯妭鐐圭殑涓暟
+ *
+ * @param codeClassifyOid 鍒嗙被鐨勪富閿�
+ * @return 涓暟
+ */
+ @Override
+ public int countChildrenByClassifyOid(String codeClassifyOid) {
+// Map<String,String> conditionMap = new HashMap<>();
+// conditionMap.put("parentCodeClassifyOid",codeClassifyOid);
+ QueryWrapper<CodeClassify> wrapper = new QueryWrapper<>();
+ wrapper.eq("parentCodeClassifyOid",codeClassifyOid);
+ return codeClassifyMapper.selectCount(wrapper).intValue();
}
}
--
Gitblit v1.9.3