From 33d8416c5a16fee7464df9774678bc60e47ff956 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 三月 2024 09:53:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index 5da8b84..a9ea031 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -48,32 +48,26 @@
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreAttrRangeService dockingPreAttrRangeService;
/***
* 鍒嗙被灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreClassifyService dockingPreClassifyService;
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreApplyFormService dockingPreApplyFormService;
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreViewModelService dockingPreViewModelService;
-
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final ICodeClassifyClient codeClassifyClient;
/**
@@ -132,7 +126,6 @@
return R.data(dockingPreAttrRangeVOS);
}
-
/**
* 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
@@ -142,7 +135,6 @@
public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
}
-
/**
* 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
@@ -174,7 +166,6 @@
return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
}
-
/***
* 鐢宠闆嗗洟缂栫爜
* @return
@@ -183,13 +174,13 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
public R applyGroupCode(String oids,String btmName){
- List<BaseModelVO> BaseModelVOS=new ArrayList<>();
try {
return groupMdmInterService.applyGroupCode(oids,btmName);
}catch (Throwable e){
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
+
/***
* 鏇存柊闆嗗洟缂栫爜鏁版嵁
* @return
@@ -222,11 +213,11 @@
}
-/***
- * 鏌ヨ鐢宠鍗曠姸鎬�
- * oids:涓氬姟鏁版嵁oid
- * @return 杩斿洖鎵ц缁撴灉淇℃伅
- */
+ /***
+ * 鏌ヨ鐢宠鍗曠姸鎬�
+ * oids:涓氬姟鏁版嵁oid
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
@GetMapping( "/queryApplyState")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
--
Gitblit v1.9.3