From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期一, 24 七月 2023 17:29:24 +0800 Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。 --- 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