From c0025985707e90ef01e4a178691c2609ba0459e5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 10:01:51 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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..0d942ba 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;
@@ -36,6 +38,7 @@
* 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
*/
private final ILifeCycleService lifeCycleService;
+
/**
* 鍒嗛〉鏌ヨ
@@ -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