From 426cd61c707f13a471b56330b3ba7b588b6cb245 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 15 六月 2023 18:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index a7be4cf..22b2d70 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -34,12 +34,13 @@
@RequestMapping("/DockingPreApplyCode")
@Api(value = "闆嗗洟灞炴�ф槧灏勯厤缃�", tags = "闆嗗洟灞炴�ф槧灏勯厤缃帴鍙�")
public class DockingPreApplyCodeController {
+
/**
* 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
*/
private final IDockingPreAttrMappingService dockingPreAttrMappingService;
-/**
+ /**
* 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
*/
private final IGroupMdmInterService groupMdmInterService;
@@ -111,6 +112,7 @@
IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
}
+
/**
* 淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
* @param dockingPreAttrMappingVOList 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
@@ -214,11 +216,11 @@
@GetMapping( "/queryApplyState")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
- public R queryApplyState(String oids){
+ public R queryApplyState(String oids){
try {
return groupMdmInterService.queryApplyState(oids);
}catch (VciBaseException e){
- return R.fail("鍚屾闆嗗洟妯″瀷瑙嗗浘澶辫触锛�"+e.getMessage());
+ return R.fail("鏌ョ湅鐢宠鍗曠姸鎬佸け璐ワ細"+e.getMessage());
}
}
}
--
Gitblit v1.9.3