Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/RevisionRuleController.java

@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.controller;

import com.alibaba.cloud.commons.lang.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.dto.RevisionRuleDTO;
@@ -12,11 +13,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 springfox.documentation.annotations.ApiIgnore;

import java.util.List;
import java.util.Map;

/**
 * Description: 版本规则控制器
@@ -49,8 +53,8 @@
   @GetMapping("page")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页查询版本规则",notes = "分页查询版本规则")
   public R<IPage<RevisionRuleVO>> page(BaseQueryObject baseQueryObject){
      return R.data(revisionRuleService.pageQueryVO(baseQueryObject));
   public R<IPage<RevisionRuleVO>> page(@ApiIgnore @RequestParam Map<String, Object> condition, Query query){
      return R.data(revisionRuleService.pageQueryVO(condition,query));
   }

   /**
@@ -60,7 +64,11 @@
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "新增或修改",notes = "传入版本规则页面对象")
   public R<RevisionRuleVO> submit(@RequestBody RevisionRuleDTO ruleDTO){
      return R.data(revisionRuleService.addSave(ruleDTO));
      if (StringUtils.isBlank(ruleDTO.getOid())) {
         return R.data(revisionRuleService.addSave(ruleDTO));
      }else {
         return R.data(revisionRuleService.editSave(ruleDTO));
      }
   }

   /**