From 795b4cacb10ec7f89154b9ce9e19bf7878051d8d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 一月 2024 16:25:53 +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 | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 55c785b..5da8b84 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
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreApplyForm;
import com.vci.ubcs.code.feign.ICodeClassifyClient;
-import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.applyjtcodeservice.vo.*;
import com.vci.ubcs.code.applyjtcodeservice.vo.collection.DockingPreAttrMappingVOList;
import com.vci.ubcs.code.applyjtcodeservice.wrapper.DockingPreApplyFormWrapper;
@@ -183,14 +183,28 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
public R applyGroupCode(String oids,String btmName){
- List<BaseModelVO> BaseModelVOs=new ArrayList<>();
+ List<BaseModelVO> BaseModelVOS=new ArrayList<>();
try {
return groupMdmInterService.applyGroupCode(oids,btmName);
}catch (Throwable e){
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
-
+ /***
+ * 鏇存柊闆嗗洟缂栫爜鏁版嵁
+ * @return
+ */
+ @PostMapping( "/receiveEditApply")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
+ public R receiveEditApply(String oids,String btmName){
+ List<BaseModelVO> BaseModelVOs=new ArrayList<>();
+ try {
+ return groupMdmInterService.receiveEditApply(oids,btmName);
+ }catch (Throwable e){
+ return R.fail("闆嗗洟鐮佹洿鏂板け璐ワ細"+e.getMessage());
+ }
+ }
/***
* 鍚屾闆嗗洟妯″瀷瑙嗗浘
--
Gitblit v1.9.3