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<>();
   @ApiOperation(value = "全部的事件",notes = "list查询事件")
   public R<List<LifeCycleEventVO>> pageEvent(){
      return R.data(lifeCycleService.listEventNoPage());
      }
      return R.data(lifeCycleService.listEvent(conditionMap,baseQueryObject.getQuery()));
   }


}