From bab515e6ecfb16c042d455fdd2f042b2fd277dda Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 11 十月 2023 00:43:11 +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 | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 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 0d942ba..9e7f298 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,23 +3,17 @@
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.BladeQueryObject;
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.springblade.core.tool.utils.BeanUtil;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -46,12 +40,9 @@
@GetMapping("page")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡",notes = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡")
- 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.getQuery()));
+ public R<IPage<LifeCycleVO>> page(@RequestParam Map<String, Object> conditionMap, Query query){
+
+ return R.data(lifeCycleService.listLife(conditionMap,query));
}
@@ -62,8 +53,8 @@
@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);
}
/**
@@ -147,14 +138,8 @@
*/
@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()));
+ @ApiOperation(value = "鍏ㄩ儴鐨勪簨浠�",notes = "list鏌ヨ浜嬩欢")
+ public R<List<LifeCycleEventVO>> pageEvent(){
+ return R.data(lifeCycleService.listEventNoPage());
}
-
-
}
--
Gitblit v1.9.3