From 3579af2945dd38d841a23cd340acd474bb63773a Mon Sep 17 00:00:00 2001 From: lihang <lihang@vci-tech.com> Date: 星期四, 04 五月 2023 18:02:01 +0800 Subject: [PATCH] 业务类型与DDL服务相关的添加 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 44 ++++---------------------------------------- 1 files changed, 4 insertions(+), 40 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 3481b1b..6547785 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 @@ -5,6 +5,8 @@ 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.starter.revision.model.TreeQueryObject; +import com.vci.ubcs.starter.revision.model.TreeWrapperOptions; import com.vci.ubcs.code.entity.CodeClassify; import com.vci.ubcs.code.entity.CodeClstemplateEntity; import com.vci.ubcs.code.entity.CodeOsbtmtypeEntity; @@ -23,15 +25,13 @@ 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.core.log.exception.ServiceException; +import com.vci.ubcs.starter.revision.model.TreeQueryObject; 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.LocalFileUtil; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; @@ -40,6 +40,7 @@ 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.springblade.core.log.exception.ServiceException; import org.apache.poi.hssf.util.HSSFColor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -984,41 +985,4 @@ return treeCodeClassify(treeQueryObject); } - /** - * 鑾峰彇杩欎釜鍒嗙被涓嬬殑涓氬姟绫诲瀷锛屽綋鍓嶆病鏈夊氨鑾峰彇涓婄骇鐨勭涓�涓笟鍔$被鍨� - * @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; - } } -- Gitblit v1.9.3