From 7f0570d20aac189f1b170942bd7100b281a1c824 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 26 四月 2023 00:07:37 +0800 Subject: [PATCH] 代码整合,新增codefixedcontroller --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 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 e189b97..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,7 +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.code.bo.TreeWrapperOptions; +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; @@ -24,22 +25,22 @@ 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 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.service.RevisionModelUtil; +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.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.springblade.core.log.exception.ServiceException; import org.apache.poi.hssf.util.HSSFColor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -927,9 +928,9 @@ */ @Override public List<CodeClassify> selectAllLevelParentByOid(String oid){ -// String sql = "select oid,level from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY) + " start with oid= :oid connect by prior PARENTCODECLASSIFYOID = oid "; -// Map< String,String> conditionMap = new HashMap< String,String>(); -// conditionMap.put("oid",oid); + // String sql = "select oid,level from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY) + " start with oid= :oid connect by prior PARENTCODECLASSIFYOID = oid "; + // Map< String,String> conditionMap = new HashMap< String,String>(); + // conditionMap.put("oid",oid); List<Map<String,Object>> cbos = codeClassifyMapper.selectAllLevelParentByOid(oid); Map<String,String> oidLevelMap = new HashMap<>(); @@ -966,7 +967,6 @@ return codeClassifyDO2VO(classifyDO); } - /** * 涓婚搴撶殑鏍� * @@ -984,4 +984,5 @@ treeQueryObject.getConditionMap().put(PARENT_FIELD_NAME, "=null"); return treeCodeClassify(treeQueryObject); } + } -- Gitblit v1.9.3