From 33f5b404064d528da54157a786031503ff723932 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 三月 2024 08:58:49 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 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..734f872 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;
@@ -48,32 +48,26 @@
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreAttrRangeService dockingPreAttrRangeService;
/***
* 鍒嗙被灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreClassifyService dockingPreClassifyService;
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreApplyFormService dockingPreApplyFormService;
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final IDockingPreViewModelService dockingPreViewModelService;
-
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
-
private final ICodeClassifyClient codeClassifyClient;
/**
@@ -109,7 +103,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆dockingPreApplyForm")
public R<IPage<DockingPreApplyFormVO>> page(DockingPreApplyForm dockingPreApplyForm, Query query) {
- IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
+ IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query.setDescs("createTime")), Condition.getQueryWrapper(dockingPreApplyForm));
return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
}
@@ -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,7 +174,6 @@
@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){
@@ -191,6 +181,21 @@
}
}
+ /***
+ * 鏇存柊闆嗗洟缂栫爜鏁版嵁
+ * @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());
+ }
+ }
/***
* 鍚屾闆嗗洟妯″瀷瑙嗗浘
@@ -208,11 +213,11 @@
}
-/***
- * 鏌ヨ鐢宠鍗曠姸鎬�
- * oids:涓氬姟鏁版嵁oid
- * @return 杩斿洖鎵ц缁撴灉淇℃伅
- */
+ /***
+ * 鏌ヨ鐢宠鍗曠姸鎬�
+ * oids:涓氬姟鏁版嵁oid
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
@GetMapping( "/queryApplyState")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
--
Gitblit v1.9.3