From 7ff176bf622d6a4bad0fb2bdf92f11a79f0dd24a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 04 五月 2023 14:17:49 +0800
Subject: [PATCH] 增加弹窗界面，整合代码

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java |   74 +++++++++++++++++++++++++++++-------
 1 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java
index 980f9a4..db94cd2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClstemplateController.java
@@ -25,10 +25,11 @@
 import com.vci.ubcs.code.mapper.CodeClstemplateMapper;
 import com.vci.ubcs.code.service.ICodeClstemplateService;
 import com.vci.ubcs.code.vo.CodeClstemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.TreeQueryObject;
 import com.vci.ubcs.code.wrapper.PlCodeClstemplateWrapper;
-import com.vci.ubcs.com.vci.starter.web.pagemodel.Tree;
-import com.vci.ubcs.com.vci.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.DataGrid;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -142,16 +143,37 @@
 		return  plCodeClstemplateService.treeCodeClassifyTemplate(treeQueryObject);
 	}
 
-//	/**
-//	 * 鍒嗙被妯℃澘鍒楄〃
-//	 * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄
-//	 * @return 鏄剧ず瀵硅薄
-//	 */
-//	@GetMapping("/gridCodeClassifyTemplate")
-//	public DataGrid<CodeClstemplateVO> gridCodeClassifyTemplate(BaseQueryObject baseQueryObject){
-//
-//		return  plCodeClstemplateService.gridCodeClassifyTemplate(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
-//	}
+	/**
+	 * 鍒嗙被妯℃澘鍒楄〃
+	 * @param plCodeClstemplate 鍩虹鏌ヨ瀵硅薄
+	 * @return 鏄剧ず瀵硅薄
+	 */
+	@GetMapping("/gridCodeClassifyTemplate")
+	public DataGrid<CodeClstemplateVO> gridCodeClassifyTemplate(CodeClstemplateVO plCodeClstemplate, Query query){
+
+		return  plCodeClstemplateService.gridCodeClassifyTemplate(plCodeClstemplate,query);
+
+	}
+
+	/**
+	 * 澧炲姞 鍒嗙被妯℃澘瀵硅薄
+	 * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
+	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+	 */
+	@PostMapping( "/addSave")
+	public R<CodeClstemplateVO> addSave(@RequestBody CodeClstemplateDTO codeClassifyTemplateDTO){
+		return plCodeClstemplateService.addSave(codeClassifyTemplateDTO);
+	}
+
+	/**
+	 * 淇敼 鍒嗙被妯℃澘瀵硅薄
+	 * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
+	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+	 */
+	@PutMapping("/editSave")
+	public R<CodeClstemplateVO> editSave(@RequestBody CodeClstemplateDTO codeClassifyTemplateDTO){
+		return plCodeClstemplateService.editSave(codeClassifyTemplateDTO);
+	}
 
 
 	/**
@@ -210,7 +232,7 @@
 
 	/**
 	 * 鍚敤
-	 * @param codeClstemplateEntity oid
+	 * @param codeClstemplateDTO oid
 	 * @return
 	 */
 	@PostMapping( "/enableData")
@@ -234,7 +256,7 @@
 	 * @return
 	 */
 	@PostMapping( "/editDate")
-	public R editDate( CodeClstemplateDTO codeClassifyDTO) {
+	public R editDate(@RequestBody CodeClstemplateDTO codeClassifyDTO) {
 		return plCodeClstemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.EDITING.getValue());
 	}
 
@@ -248,4 +270,26 @@
 
 		return plCodeClstemplateService.Upgrade(codeClassifyDTO);
 	}
+
+	@GetMapping( "/upgrade1")
+	public R upgrade1(@RequestBody CodeClstemplateDTO codeClassifyDTO) {
+		return Upgrade(codeClassifyDTO);
+	}
+
+	/**
+	 * 鍏嬮殕
+	 * @param codeClassifyDTO
+	 * @return oid妯℃澘oid
+	 */
+	@PostMapping( "/copy")
+	public R copyTemplate(@RequestBody CodeClstemplateDTO codeClassifyDTO) {
+
+		return plCodeClstemplateService.copyTemplate(codeClassifyDTO);
+	}
+
+	@GetMapping( "/copyTemplate1")
+	public R copyTemplate1(@RequestBody CodeClstemplateDTO codeClassifyDTO) {
+
+		return copyTemplate(codeClassifyDTO);
+	}
 }

--
Gitblit v1.9.3