From 25b0f8a39885fafc7021162034632e01f9dd1b8d Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期二, 11 七月 2023 19:22:40 +0800
Subject: [PATCH] 修复生命周期新增异常，修改详情接口
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 7410c7a..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,9 +3,11 @@
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;
@@ -37,6 +39,7 @@
*/
private final ILifeCycleService lifeCycleService;
+
/**
* 鍒嗛〉鏌ヨ
*/
@@ -59,8 +62,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);
}
/**
@@ -139,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