From d74e1672af99afd7e6a24327deb22b308dd5fc88 Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期一, 04 十二月 2023 08:38:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java index 0924909..42e4177 100644 --- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java +++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java @@ -56,8 +56,10 @@ * 闆嗗洟鍒嗙被鐢宠鍗曟湇鍔� */ private final IDockingPreClassifyService dockingPreClassifyService; - - + /*** + * 灞炴�ф槧灏勬湇鍔� + */ + private final IDockingPreAttrMappingService dockingPreAttrMappingService; /** * 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟 */ @@ -81,6 +83,22 @@ return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage()); } } + + /*** + * 鏌ヨ闆嗗洟灞炴�ф槧灏� + * @param codeClassifyOid:缂栫爜鍒嗙被oid + * @return + */ + @Override + public R<List<DockingPreAttrMappingVO>> list_mapping(String codeClassifyOid) { + List<DockingPreAttrMapping> dockingPreAttrMappings= dockingPreAttrMappingService.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId,codeClassifyOid)); + List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>(); + if(!CollectionUtils.isEmpty(dockingPreAttrMappings)){ + dockingPreAttrMappingVOList=dockingPreAttrMappingService.dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,true); + } + return R.data(dockingPreAttrMappingVOList); + } + /*** * 鐢宠闆嗗洟缂栫爜鏁版嵁缁存姢 * @return -- Gitblit v1.9.3