From e4b8835bdf9113fe31d1046e196fbbc4d76b5d42 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期二, 30 五月 2023 10:09:07 +0800 Subject: [PATCH] 集团接口方法移植开发 --- Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 29 ++++++++++++++ Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java | 7 +++ Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormStatusVO.java | 55 +++++++++++++++++++++++++++ Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java | 1 Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java | 6 ++ Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelQueryVO.java | 11 +++++ 6 files changed, 107 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java index fabc948..e80491b 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java +++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java @@ -40,7 +40,11 @@ @GetMapping(RETURNGROUPCODE) public R getApplyGroupCode( @RequestParam("dockingResultVO") DockingReturnStoreVO dockingResultVO); - + /*** + * 涓绘暟鎹ā鍨嬭鍥惧彂甯� + * @param dockingClassifyModelAttrVO + * @return + */ @PostMapping(PUBMDMMODEL) R pubMdmModel(@RequestParam("dockingClassifyModelAttrVO") DockingClassifyModelAttrVO dockingClassifyModelAttrVO); diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java index 8b74ced..c8283d5 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java +++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java @@ -54,5 +54,12 @@ */ @PostMapping("/externalMainData/queryClassModel") DockingQueryClassModelVO queryClassModel(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO); + /*** + * 鏌ヨ鐢宠鍗曠姸鎬� + * @param dockingModelQueryVO + * @return 鎵ц缁撴灉 + */ + @PostMapping("/externalMainData/queryApplyState") + DockingApplyFormStatusVO queryApplyState(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO); } diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormStatusVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormStatusVO.java new file mode 100644 index 0000000..e78acd8 --- /dev/null +++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingApplyFormStatusVO.java @@ -0,0 +1,55 @@ +package com.vci.ubcs.code.webservice.vo; + +/*** + * 鐢宠鍗曠姸鎬佸璞� + * @author xiejun + * @date 2023-05-29 + */ +public class DockingApplyFormStatusVO { + + /*** + * 鐢宠鍗曞彿 + */ + private String applyNum; + /*** + * 鐢宠鍗曠姸鎬� + */ + private String formState; + /** + * 瀹℃牳鎰忚 + */ + private String examineOpinion; + + public String getApplyNum() { + return applyNum; + } + + public void setApplyNum(String applyNum) { + this.applyNum = applyNum; + } + + public String getFormState() { + return formState; + } + + public void setFormState(String formState) { + this.formState = formState; + } + + public String getExamineOpinion() { + return examineOpinion; + } + + public void setExamineOpinion(String examineOpinion) { + this.examineOpinion = examineOpinion; + } + + @Override + public String toString() { + return "DockingApplyFormStatusVO{" + + "applyNum='" + applyNum + '\'' + + ", formState='" + formState + '\'' + + ", examineOpinion='" + examineOpinion + '\'' + + '}'; + } +} diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelQueryVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelQueryVO.java index 4f1cf77..2db7723 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelQueryVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelQueryVO.java @@ -5,6 +5,8 @@ private String classId; + private String applyNums; + public String getSysName() { return sysName; } @@ -21,11 +23,20 @@ this.classId = classId; } + public String getApplyNums() { + return applyNums; + } + + public void setApplyNums(String applyNums) { + this.applyNums = applyNums; + } + @Override public String toString() { return "DockingModelQueryVO{" + "sysName='" + sysName + '\'' + ", classId='" + classId + '\'' + + ", applyNums='" + applyNums + '\'' + '}'; } } diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java index 88d06a4..099beaf 100644 --- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java +++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/feigh/MdmInterJtClient.java @@ -63,7 +63,6 @@ * 涓绘暟鎹笟鍔℃湇鍔� */ - /** * 鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� * @param dockingReturnStoreVO diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java index 90eaac9..b5c4500 100644 --- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java @@ -383,6 +383,7 @@ log.info(message); throw new Throwable(message); } + DockingModelQueryVO dockingModelQueryVO = new DockingModelQueryVO(); dockingModelQueryVO.setSysName(dockingApplySysName); DockingQueryModelVO dockingQueryModelVO= mdmApplyGroupCodeProvider.queryMdmModel(dockingModelQueryVO); @@ -451,6 +452,34 @@ } + + /*** + * 鏌ヨ鐢宠鍗曠姸鎬� + * @param dataOids + * @return 鎵ц缁撴灉 + */ + public R queryApplyState(String dataOids) { + + String message="鎵ц鎴愬姛锛�"; + log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tatr"); + try { + VciBaseUtil.alertNotNull(dataOids,"鎵�鏌ョ敵璇峰崟鏁版嵁涓婚敭"); + VciBaseUtil.alertNotNull(dockingApplySysName,"绯荤粺鏍囪瘑閰嶇疆锛歞ocking.apply.unitCode"); + + List<DockingPreApplyForm> dockingPreApplyFormList= this.dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().in(DockingPreApplyForm::getDataOid, VciBaseUtil.str2List(dataOids))); + dockingPreApplyFormList.stream().forEach(dockingPreApplyForm -> { + dockingPreApplyForm.getId(); + + }); + + }catch (Throwable e){ + e.printStackTrace();; + log.error("鑾峰彇鏁版嵁妯″瀷澶辫触"+e); + R.fail(message); + } + log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd"); + return R.success(message); + } /*** * 缁勭粐 淇濆瓨鏁版嵁鏂规硶 * -- Gitblit v1.9.3