From db1c3c5b3670639fd1dfc5de0fe75ce6f02f732e Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 31 五月 2023 14:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 1 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 90eaac9..b0b17d6 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
@@ -326,7 +326,7 @@
* @throws VciBaseException
*/
@Override
- public R queryClassModel(String groupClassifyId) throws VciBaseException {
+ public R queryClassModel(String groupClassifyId) throws Throwable {
log.info("鑾峰彇闆嗗洟妯″瀷璇︾粏淇℃伅鎵ц淇濆瓨start");
String message="鎵ц鎴愬姛锛�";
try {
@@ -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,95 @@
}
+
+ /***
+ * 鏌ヨ鐢宠鍗曠姸鎬�
+ * @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);
+ }
+
+ /***
+ * 鍚屾闆嗗洟妯″瀷淇℃伅
+ * @param classifyId
+ * @param operationType
+ * @return 杩斿洖鎵ц缁撴灉
+ * @throws VciBaseException
+ */
+ @Override
+ public R syncClassifyModel(String classifyId, String operationType) throws VciBaseException {
+ VciBaseUtil.alertNotNull(operationType,"闆嗘垚鎿嶄綔绫诲瀷");
+ try {
+ if(operationType.equals("all")){
+ return queryMdmModel();
+ }else{
+ VciBaseUtil.alertNotNull(classifyId,"闆嗗洟鍒嗙被涓婚敭");
+ return queryClassModel(classifyId);
+ }
+ } catch (Throwable e) {
+ throw new VciBaseException(e.getMessage());
+ }
+ }
+
+// /**
+// * 鍚屾涓绘ā鍨�
+// * @return
+// */
+// private String queryMdmModel() throws VciBaseException {
+// String message="鎵ц鎴愬姛锛�";
+// try {
+//
+//
+// }catch (VciBaseException e){
+// message=e.getMessage();
+// throw new VciBaseException(message);
+// }finally {
+// return message;
+// }
+//
+//
+// }
+//
+// /***
+// * 鍚屾妯″瀷璇︾粏淇℃伅
+// * @param classifyId
+// * @return
+// */
+// private String queryClassModel(String classifyId)throws VciBaseException{
+// String message="鎵ц鎴愬姛锛�";
+// try {
+//
+// }catch (VciBaseException e){
+// message=e.getMessage();
+// throw new VciBaseException(message);
+// }finally {
+// return message;
+// }
+//
+// }
+
+
/***
* 缁勭粐 淇濆瓨鏁版嵁鏂规硶
*
--
Gitblit v1.9.3