From 1519bfe8ba7115452e06af88fc51e8f5529f2798 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 10:01:41 +0800
Subject: [PATCH] 提交代码

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
index c3a9567..7410c7a 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
@@ -8,7 +8,7 @@
 import com.vci.ubcs.omd.vo.BtmTypeVO;
 import com.vci.ubcs.omd.vo.LifeCycleVO;
 import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -43,12 +43,12 @@
 	@GetMapping("page")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡",notes = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡")
-	public R<IPage<LifeCycleVO>> page(BaseQueryObject baseQueryObject){
-		Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+	public R<IPage<LifeCycleVO>> page(BladeQueryObject baseQueryObject){
+		Map<String, Object> conditionMap = baseQueryObject.getConditionMap();
 		if (conditionMap == null){
 			conditionMap = new HashMap<>();
 		}
-		return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getPageHelper()));
+		return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getQuery()));
 	}
 
 
@@ -64,26 +64,48 @@
 	}
 
 	/**
-	 * 鏂板鎴栦慨鏀�
+	 * 鏂板
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
-	public R<LifeCycleVO> submit(@RequestBody LifeCycleDTO lifeCycleDTO){
+	@ApiOperation(value = "鏂板",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<LifeCycleVO> addSave(@RequestBody LifeCycleDTO lifeCycleDTO){
 		return R.data(lifeCycleService.addSave(lifeCycleDTO));
 	}
 
 	/**
-	 * 鏂板鎴栦慨鏀�
+	 * 淇敼
+	 */
+	@PutMapping("/edit-save")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "淇敼",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<LifeCycleVO> editSave(@RequestBody LifeCycleDTO lifeCycleDTO){
+		return R.data(lifeCycleService.editSave(lifeCycleDTO));
+	}
+
+
+
+	/**
+	 * 鏂板
 	 */
 	@PostMapping("/batch-submit")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐘舵�佹睜椤甸潰瀵硅薄")
-	public R<List<LifeCycleVO>> batchSubmit(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
+	@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<List<LifeCycleVO>> batchAddSave(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
 		return R.data(lifeCycleService.batchAddSave(lifeCycleDTOs));
 	}
 
 	/**
+	 * 淇敼
+	 */
+	@PostMapping("/batch-edit-save")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "淇敼",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<List<LifeCycleVO>> batchEditSave(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
+		return R.data(lifeCycleService.batchEditSave(lifeCycleDTOs));
+	}
+
+	/**
 	 * 鍒犻櫎
 	 */
 	@PostMapping("/remove")

--
Gitblit v1.9.3