From f39675fad28f66dd32aee1d3ee805ad99007bce5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 02 六月 2023 21:13:16 +0800
Subject: [PATCH] 代码整合

---
 Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 4 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 7e52aaa..d530041 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
@@ -3,8 +3,10 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.feign.ICodeClassifyClient;
 import com.vci.ubcs.code.webservice.service.*;
 import com.vci.ubcs.code.webservice.vo.*;
+import com.vci.ubcs.code.webservice.vo.collection.DockingPreAttrMappingVOList;
 import com.vci.ubcs.code.webservice.wrapper.DockingPreApplyFormWrapper;
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.revision.model.TreeQueryObject;
@@ -17,7 +19,7 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,7 +62,18 @@
 
 	private final IDockingPreApplyFormService dockingPreApplyFormService;
 
+	/***
+	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
+	 */
 
+	private final IDockingPreViewModelService dockingPreViewModelService;
+
+
+	/***
+	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
+	 */
+
+	private final ICodeClassifyClient codeClassifyClient;
 
 	/**
 	 * 鏍规嵁涓绘暟鎹紪鐮乷id鑾峰彇闆嗗洟灞炴�ф槧灏勪俊鎭�
@@ -106,10 +119,11 @@
 	@PostMapping( "/batchAddSave")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "淇濆瓨灞炴�ф槧灏勯厤缃�", notes = "dockingPreAttrMappingVOList")
-	public R batchSave(@Valid @RequestBody List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList){
+	public R batchSave(@RequestBody DockingPreAttrMappingVOList dockingPreAttrMappingVOList){
+		List<DockingPreAttrMappingVO> dockingPreAttrMappingVOs = dockingPreAttrMappingVOList.getDockingPreAttrMappingVOList();
 		List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS=new ArrayList<>();
 		try {
-			 dockingPreAttrRangeVOS = dockingPreAttrMappingService.batchAddSave(dockingPreAttrMappingVOList);
+			 dockingPreAttrRangeVOS = dockingPreAttrMappingService.batchAddSave(dockingPreAttrMappingVOs);
 		}catch (Exception e){
 			return R.fail("闆嗗洟闆嗘垚灞炴�ф槧灏勯厤缃繚瀛樺け璐ワ細"+e.getMessage());
 		}
@@ -120,12 +134,44 @@
 	/**
 	 * 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
 	 * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
-	 * @return 涓婚搴撳垎绫绘樉绀烘爲
+	 * @return 闆嗗洟鍒嗙被鏄剧ず鏍�
 	 */
 	@GetMapping("/referTree")
 	public List<Tree> referTree(TreeQueryObject treeQueryObject)  {
 		return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
 	}
+
+
+	/**
+	 * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
+	 * @param classifyId 涓绘暟鎹垎绫讳富閿�
+	 * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
+	 */
+	@GetMapping("/listViewModelAttributeByClassId")
+	public R listViewModelAttributeByClassId(String classifyId)  {
+		return R.data(dockingPreViewModelService.selectDockingPreViewModelByClassId(classifyId,true));
+	}
+
+	/**
+	 * 鍙傜収鏍� 涓绘暟鎹垎绫�
+	 * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
+	 * @return 涓婚搴撳垎绫绘樉绀烘爲
+	 */
+	@GetMapping("/referCodeClassifyTree")
+	public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject)  {
+		return codeClassifyClient.referCodeClassifyTree(treeQueryObject);
+	}
+
+	/**
+	 * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
+	 * @param codeClassifyId 涓绘暟鎹垎绫讳富閿�
+	 * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
+	 */
+	@GetMapping("/listCodeAttributeByClassId")
+	public R listCodeAttributeByClassId(String codeClassifyId)  {
+		return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
+	}
+
 
 	/***
 	 * 鐢宠闆嗗洟缂栫爜
@@ -143,6 +189,7 @@
 		}
 	}
 
+
 	/***
 	 * 鍚屾闆嗗洟妯″瀷瑙嗗浘
 	 * @return 杩斿洖鎵ц缁撴灉淇℃伅

--
Gitblit v1.9.3