From af73b1917e58e37daaa3e63f5303da1056cedfa3 Mon Sep 17 00:00:00 2001 From: wang1 <844966816@qq.com> Date: 星期四, 13 七月 2023 18:18:26 +0800 Subject: [PATCH] 修复生命周期调试异常,整理流程代码 --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 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 bde6368..847c2c7 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 @@ -1,5 +1,6 @@ package com.vci.ubcs.omd.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.vci.ubcs.omd.dto.LifeCycleDTO; @@ -15,12 +16,14 @@ 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.Locale; import java.util.Map; /** @@ -46,12 +49,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)); } @@ -147,14 +147,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