From 3aae81075a18a11d6b605c7583eb03b75366b466 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期四, 18 四月 2024 00:08:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupAttrPoolMappingService.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupAttrPoolMappingService.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupAttrPoolMappingService.java index d0dd9e6..90f8de1 100644 --- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupAttrPoolMappingService.java +++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupAttrPoolMappingService.java @@ -1,14 +1,17 @@ package com.vci.ubcs.code.applyjtcodeservice.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreMetaAttr; import com.vci.ubcs.code.applyjtcodeservice.entity.GroupAttrPoolMapping; import com.vci.ubcs.code.applyjtcodeservice.vo.GroupAttrPoolMappingVO; +import com.vci.ubcs.omd.vo.EnumVO; +import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.api.R; import javax.sql.rowset.serial.SerialException; import java.util.List; -import java.util.Map; /** * 闆嗗洟灞炴�ф睜鏄犲皠鏈嶅姟灞� @@ -19,11 +22,11 @@ /** * 鏌ヨ鍏ㄩ儴闆嗗洟灞炴�ф睜鏄犲皠鐨勫睘鎬� - * @param GroupAttrPoolMappingVO + * @param bladeQueryObject * @return * @throws SerialException */ - List<GroupAttrPoolMappingVO> getGroupAttrPoolALlList(GroupAttrPoolMappingVO GroupAttrPoolMappingVO) throws SerialException; + IPage<GroupAttrPoolMappingVO> getGroupAttrPoolALlList(BladeQueryObject bladeQueryObject) throws ServiceException; /** * 鏍规嵁闆嗗洟灞炴�х紪鍙锋煡璇㈤泦鍥㈠睘鎬ф睜鏄犲皠 @@ -31,7 +34,7 @@ * @return * @throws SerialException */ - List<GroupAttrPoolMappingVO> getByGroupAttrKeyList(GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws SerialException; + List<GroupAttrPoolMappingVO> getByGroupAttrKeyList(GroupAttrPoolMappingVO groupAttrPoolMappingVO) throws ServiceException; /** * 鐐瑰嚮鍚屾璇︾粏妯″瀷鏃惰皟鐢ㄨ鏂规硶锛� @@ -39,7 +42,7 @@ * @return * @throws SerialException */ - boolean saveDistinctGroupAttr(List<DockingPreMetaAttr> dockingPreMetaAttrList) throws SerialException; + boolean saveDistinctGroupAttr(List<DockingPreMetaAttr> dockingPreMetaAttrList) throws ServiceException; /** * 闆嗗洟灞炴�ф槧灏勭晫闈慨鏀圭殑鏄犲皠閰嶇疆淇濆瓨 @@ -47,7 +50,7 @@ * @return * @throws SerialException */ - boolean editGroupAttr(List<GroupAttrPoolMappingVO> groupAttrPoolMappingVO) throws SerialException; + boolean editGroupAttr(List<GroupAttrPoolMappingVO> groupAttrPoolMappingVO) throws ServiceException; /** * 鍚屾闆嗗洟灞炴�ф睜涓殑鏄犲皠閰嶇疆鍒帮紝鎵�鏈夊簲鐢ㄤ簡璇ラ泦鍥㈠睘鎬х殑鍏蜂綋鏌愪釜鍒嗙被涓婂幓 @@ -55,6 +58,13 @@ * @return * @throws SerialException */ - boolean syncGroupAttrMapping(List<GroupAttrPoolMappingVO> groupAttrPoolMappingVOS) throws SerialException; + R syncGroupAttrMapping(List<GroupAttrPoolMappingVO> groupAttrPoolMappingVOS) throws ServiceException; + + /** + * 鏍规嵁鍒嗙被OID鑾峰彇鍒版ā鏉垮啀鏍规嵁灞炴�d鑾峰彇鍒版ā鏉夸笅鐨勫睘鎬d鐨別num鍊硷紝鐒跺悗鏌ヨ鍑烘灇涓� + * @param groupAttrPoolMappingVOS + * @return + */ + List<EnumVO> getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS); } -- Gitblit v1.9.3