From 426cd61c707f13a471b56330b3ba7b588b6cb245 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 15 六月 2023 18:11:58 +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/RevisionRuleController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/RevisionRuleController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/RevisionRuleController.java
index 96e0c27..a27dd86 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/RevisionRuleController.java
+++ b/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));
+ }
}
/**
--
Gitblit v1.9.3