From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 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 2360c4b..bde6368 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
@@ -3,12 +3,13 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.vci.ubcs.omd.dto.LifeCycleDTO;
+import com.vci.ubcs.omd.entity.LifeCycleEvent;
 import com.vci.ubcs.omd.entity.LifeCycleRule;
 import com.vci.ubcs.omd.service.ILifeCycleService;
 import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LifeCycleEventVO;
 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;
@@ -38,6 +39,7 @@
 	 */
 	private final ILifeCycleService lifeCycleService;
 
+
 	/**
 	 * 鍒嗛〉鏌ヨ
 	 */
@@ -60,28 +62,50 @@
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "鏌ョ湅璇︽儏", notes = "鐢熷懡鍛ㄦ湡")
 	public R<LifeCycleVO> detail(LifeCycleDTO lifeCycleDTO){
-		LifeCycleRule lifeCycleRule = lifeCycleService.getOne(Condition.getQueryWrapper(BeanUtil.copy(lifeCycleDTO, LifeCycleRule.class)));
-		return R.data(LifeCycleRuleWrapper.build().entityVO(lifeCycleRule));
+		LifeCycleVO vo = lifeCycleService.detail(lifeCycleDTO);
+		return R.data(vo);
 	}
 
 	/**
-	 * 鏂板鎴栦慨鏀�
+	 * 鏂板
 	 */
 	@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));
 	}
 
 	/**
@@ -118,5 +142,19 @@
 		return R.data(lifeCycleService.listUses(lifeCycleDTO));
 	}
 
+	/**
+	 * 鍏ㄩ儴鐨勪簨浠�
+	 */
+	@GetMapping("page-event")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "鍏ㄩ儴鐨勪簨浠�",notes = "鍒嗛〉鏌ヨ浜嬩欢")
+	public R<IPage<LifeCycleEventVO>> pageEvent(BladeQueryObject baseQueryObject){
+		Map<String, Object> conditionMap = baseQueryObject.getConditionMap();
+		if (conditionMap == null){
+			conditionMap = new HashMap<>();
+		}
+		return R.data(lifeCycleService.listEvent(conditionMap,baseQueryObject.getQuery()));
+	}
+
 
 }

--
Gitblit v1.9.3