From a4d7993d0b44faffe2e548250a9d2bc27c77e521 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期三, 19 七月 2023 12:27:46 +0800 Subject: [PATCH] 集成获取分类接口（包含编码规则码段码值信息） --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java index 6ad2c7f..df6cba9 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java @@ -6,11 +6,14 @@ import com.vci.ubcs.code.entity.CodeBasicSec; import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO; import com.vci.ubcs.starter.exception.VciBaseException; +import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; import com.vci.ubcs.starter.web.pagemodel.KeyValue; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔℃帴鍙� @@ -22,12 +25,12 @@ /** * 鏌ヨ鎵�鏈夌殑鐮佹鍩虹淇℃伅 - * @param codeBasicSecVO 鏌ヨ鏉′欢 - * @param page 鍒嗛〉鍜屾帓搴� + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉瀵硅薄 * @return 鎵ц缁撴灉 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 */ - IPage<CodeBasicSecVO> gridCodeBasicSec(IPage<CodeBasicSecVO> page, CodeBasicSecVO codeBasicSecVO) throws VciBaseException; + IPage<CodeBasicSecVO> gridCodeBasicSec(Query query, Map<String,Object> conditionMap) throws VciBaseException; /** * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅 @@ -94,20 +97,20 @@ /** * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃 - * @param codeBasicSecVO 鏌ヨ鏉′欢 - * @param page 鍒嗛〉鍜屾帓搴� + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉鍜屾帓搴� * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父 */ - IPage<CodeBasicSecVO> refDataGridCodeBasicSec(IPage<CodeBasicSecVO> page, CodeBasicSecVO codeBasicSecVO) throws VciBaseException; + IPage<CodeBasicSecVO> refDataGridCodeBasicSec(Query query ,Map<String,Object> conditionMap) throws VciBaseException; /** * 鍙傜収鍒嗙被鐨勭爜娈� - * @param codeBasicSecVO 鏌ヨ鏉′欢 - * @param page 鍒嗛〉鐨勫璞� + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉鍜屾帓搴� * @return 鐮佹鐨勫唴瀹� */ - IPage<CodeBasicSecVO> refDataGridClassifySec(IPage<CodeBasicSecVO> page, CodeBasicSecVO codeBasicSecVO); + IPage<CodeBasicSecVO> refDataGridClassifySec(Query query ,Map<String,Object> conditionMap); /** * 鍏嬮殕鐮佹淇℃伅 @@ -145,10 +148,10 @@ /** * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭 - * @param oid 瑙勫垯鐨勫唴瀹� + * @param ruleOid 瑙勫垯鐨勫唴瀹� * @return 鐮佹鐨勫唴瀹� */ - List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String oid); + List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid); /** * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� @@ -161,6 +164,14 @@ List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException; /** + * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� + * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃 + * @return 鏄剧ず瀵硅薄 + * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父 + */ + List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSec> codeBasicSecDOs) throws VciBaseException; + + /** * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞� * @param codeBasicSecDO 鏁版嵁瀵硅薄 * @return 鏄剧ず瀵硅薄 -- Gitblit v1.9.3