From 4c3d21652873e2011b99d36388e86c3f9af1aa63 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 29 五月 2023 17:53:42 +0800
Subject: [PATCH] 动态表格组件更新
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
index 6ddef1b..fbc0489 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
@@ -1,14 +1,27 @@
package com.vci.ubcs.code.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.entity.DockingPreApplyForm;
+import com.vci.ubcs.code.feign.IMdmInterJtClient;
+import com.vci.ubcs.code.service.IDockingPreApplyFormService;
import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
+import com.vci.ubcs.code.service.IDockingPreClassifyService;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
+import com.vci.ubcs.code.wrapper.DockingPreApplyFormWrapper;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +37,7 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("ubcs-code/DockingPreApplyCode")
+@RequestMapping("/DockingPreApplyCode")
@Api(value = "闆嗗洟灞炴�ф槧灏勯厤缃�", tags = "闆嗗洟灞炴�ф槧灏勯厤缃帴鍙�")
public class DockingPreApplyCodeController {
/**
@@ -37,6 +50,20 @@
private final IDockingPreAttrRangeService dockingPreAttrRangeService;
+ /***
+ * 鍒嗙被灞炴�ф灇涓捐寖鍥存湇鍔�
+ */
+
+ private final IDockingPreClassifyService dockingPreClassifyService;
+
+ /***
+ * 灞炴�ф灇涓捐寖鍥存湇鍔�
+ */
+
+ private final IDockingPreApplyFormService dockingPreApplyFormService;
+
+
+
/**
* 鏍规嵁涓绘暟鎹紪鐮乷id鑾峰彇闆嗗洟灞炴�ф槧灏勪俊鎭�
* @param codeClassifyId 涓婚敭
@@ -44,9 +71,9 @@
*/
@GetMapping("/gridAttrMapping")
@ApiOperationSupport(order = 8)
- @ApiOperation(value = "鍒嗙被涓婚敭鑾峰彇涓庨泦鍥㈡ā鍨嬪睘鎬ф槧灏勫叧绯�", notes = "浼犲叆codeClassifyId")
- public R getDockingAttrMappingsByCodeClassId(String codeClassifyId){
- List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingService.getdockingAttrMappingsByCodeclassId(codeClassifyId);
+ @ApiOperation(value = "鍒嗙被涓婚敭鑾峰彇涓庨泦鍥㈡ā鍨嬪睘鎬ф槧灏勫叧绯�", notes = "浼犲叆涓绘暟鎹�:codeClassifyId,闆嗗洟鍒嗙被:sourceClassifyId")
+ public R getDockingAttrMappingsByCodeClassId(String codeClassifyId,String sourceClassifyId){
+ List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingService.getDockingAttrMappingsByCodeClassifyId(codeClassifyId,sourceClassifyId);
return R.data(dockingPreAttrMappingVOList);
}
@@ -64,11 +91,23 @@
}
/**
+ * 鐢宠鍗曟煡璇� 鑷畾涔夊垎椤�
+ */
+ @GetMapping("/page")
+ @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));
+ return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
+ }
+ /**
* 淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
* @param dockingPreAttrMappingVOList 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
@PostMapping( "/batchAddSave")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "淇濆瓨灞炴�ф槧灏勯厤缃�", notes = "dockingPreAttrMappingVOList")
public R batchSave(@Valid @RequestBody List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList){
List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS=new ArrayList<>();
try {
@@ -79,4 +118,30 @@
return R.data(dockingPreAttrRangeVOS);
}
+
+ /**
+ * 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
+ * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
+ * @return 涓婚搴撳垎绫绘樉绀烘爲
+ */
+ @GetMapping("/referTree")
+ public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) {
+ return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
+ }
+
+ /***
+ * 鐢宠闆嗗洟缂栫爜
+ * @return
+ */
+ @PostMapping( "/applyGroupCode")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
+ public R applyGroupCode(String oids,String btmName){
+ List<BaseModelVO> BaseModelVOs=new ArrayList<>();
+ try {
+ return dockingPreAttrMappingService.applyGroupCode(oids,btmName);
+ }catch (Throwable e){
+ return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3