From 7918c0611f1cdf1cad82250225307e5185abac4c Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 27 十月 2023 10:37:49 +0800 Subject: [PATCH] bug修改：148（历史数据导入报错，当前分类没有设置编码规则，未找父级的编码规则的bug）；150（主数据新增时未先找当前层级的编码规则，再向上查找的bug） --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java index 103dac5..729c5a5 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeReferBtmTypeService.java @@ -2,10 +2,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vci.ubcs.omd.vo.AttributeVO; +import com.vci.ubcs.omd.vo.BtmTypeAttributeVO; import com.vci.ubcs.omd.vo.BtmTypeVO; import com.vci.ubcs.starter.web.enumpck.BooleanEnum; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import com.vci.ubcs.starter.web.util.BeanUtil; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; @@ -25,14 +27,14 @@ * @param baseQueryObject 鏌ヨ鏉′欢 * @return 鍒楄〃鐨勫唴瀹� */ - Page<BtmTypeVO> referDataGrid(BaseQueryObject baseQueryObject); + Page<BtmTypeVO> referDataGrid(BaseQueryObject baseQueryObject) throws ServiceException; /** * 鑾峰彇涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬э紝涓嶅垎椤� * @param baseQueryObject 鏌ヨ瀵硅薄 * @return 灞炴�х殑淇℃伅 */ - Page<AttributeVO> gridAttributesByBtmId(BaseQueryObject baseQueryObject); + Page<BtmTypeAttributeVO> gridAttributesByBtmId(BaseQueryObject baseQueryObject) throws ServiceException ; } -- Gitblit v1.9.3