From 20633c4c46b1b0498fb5ca36d3a731eaa5b99c54 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期三, 07 六月 2023 16:42:13 +0800 Subject: [PATCH] 集团申请单接口增加 --- Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 71 ++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 7 deletions(-) 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 0770e17..f48bdac 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 @@ -438,7 +438,7 @@ throw new Throwable(message); } }else{ - message="鏈幏浠庨泦鍥㈣幏鍙栧埌浠讳綍妯″瀷淇℃伅"; + message="鏈粠闆嗗洟鑾峰彇鍒颁换浣曟ā鍨嬩俊鎭�"; log.info(message); throw new Throwable(message); } @@ -459,24 +459,57 @@ * @param dataOids * @return 鎵ц缁撴灉 */ - public R queryApplyState(String dataOids) { + @Override + public R queryApplyState(String dataOids) throws VciBaseException { String message="鎵ц鎴愬姛锛�"; log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tatr"); try { VciBaseUtil.alertNotNull(dataOids,"鎵�鏌ョ敵璇峰崟鏁版嵁涓婚敭"); VciBaseUtil.alertNotNull(dockingApplySysName,"绯荤粺鏍囪瘑閰嶇疆锛歞ocking.apply.unitCode"); - + List<String> applyIdList=new ArrayList<>(); List<DockingPreApplyForm> dockingPreApplyFormList= this.dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().in(DockingPreApplyForm::getDataOid, VciBaseUtil.str2List(dataOids))); + Map<String,DockingPreApplyForm> dockingPreApplyFormMap=new HashMap<>(); dockingPreApplyFormList.stream().forEach(dockingPreApplyForm -> { - dockingPreApplyForm.getId(); - + applyIdList.add(dockingPreApplyForm.getId()); + dockingPreApplyFormMap.put(dockingPreApplyForm.getId(),dockingPreApplyForm); }); + + DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO(); + dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{}))); + dockingModelQueryVO.setSysName(dockingApplySysName); + DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO); + + int code=dockingApplyFormQueryStatusVO.getCode(); + String mesg=dockingApplyFormQueryStatusVO.getMsg(); + if(code==1){ + List<DockingApplyFormStatusVO> dockingApplyFormStatusVOList=dockingApplyFormQueryStatusVO.getData(); + if(CollectionUtils.isEmpty(dockingApplyFormStatusVOList)){ + for (DockingApplyFormStatusVO applyFormDataState : dockingApplyFormStatusVOList) { + String applyId=applyFormDataState.getApplyNum(); + String state= applyFormDataState.getFormState(); + String examineOpinion=applyFormDataState.getExamineOpinion(); + String jmsg=getCodeState(state)+"锛屾剰瑙侊細"+examineOpinion; + if(dockingPreApplyFormMap.containsKey(applyId)){ + DockingPreApplyForm applyFormObject=dockingPreApplyFormMap.get(applyId); + applyFormObject.setMsg(jmsg); + } + } + boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList); + if(res){ + R.success("鐢宠闆嗗洟鐮佺姸鎬佹煡璇㈡垚鍔�:"+mesg); + } + }else{ + throw new Throwable("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭�"); + } + }else{ + throw new Throwable(mesg); + } }catch (Throwable e){ e.printStackTrace();; - log.error("鑾峰彇鏁版嵁妯″瀷澶辫触"+e); - R.fail(message); + log.error("鑾峰彇鐢宠鍗曠姸鎬佸け璐�"+e); + throw new VciBaseException(message); } log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd"); return R.success(message); @@ -968,4 +1001,28 @@ } return value; } + + private String getCodeState(String formState){ + String msg=""; + if("1".equals(formState)){ + msg="闆嗗洟瀹℃牳涓�"; + }else if("2".equals(formState)){ + msg="椹冲洖"; + }else if("3".equals(formState)){ + msg="闆嗗洟瀹℃牳涓�"; + }else if("4".equals(formState)){ + msg="瀹℃牳缁撴潫锛岃祴鐮佸け璐�"; + }else if("5".equals(formState)){ + msg="瀹℃牳缁撴潫锛岃祴鐮佹垚鍔�"; + }else if("6".equals(formState)){ + msg="寰�301璧嬬爜"; + }else if("7".equals(formState)){ + msg="宸茶祴鐮�"; + }else if("8".equals(formState)){ + msg="宸茶祴鐮侊紙娌跨敤锛�"; + }else if("9".equals(formState)){ + msg="瀹℃牳涓�"; + } + return msg; + } } -- Gitblit v1.9.3