From e395049f60b14ffbc89c98ad3d6f322d6878e6a7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 01 十一月 2023 19:31:20 +0800
Subject: [PATCH] bug列表156（主数据数据更改时，数据版本规则未按照规则升版）bug修改，157（数据更改，第二次对数据进行更改时，报错的bug，业务逻辑存在问题）
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
index 91090da..434e040 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
@@ -13,9 +13,9 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.cglib.beans.BeanMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.*;
@@ -54,7 +54,16 @@
@GetMapping(GET_REF_PAGE)
@Override
public R<IPage<RevisionRuleVO>> getRefPage(BaseQueryObject baseQueryObject) {
- return R.data(service.pageQueryVO(baseQueryObject));
+ Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+ if (conditionMap == null){
+ conditionMap = new HashMap<>();
+ }
+ Query query = new Query();
+ query.setSize(baseQueryObject.getLimit());
+ query.setCurrent(baseQueryObject.getPage());
+ Map<String,Object> condition = new HashMap<>();
+ BeanUtil.copy(conditionMap,condition);
+ return R.data(service.pageQueryVO(condition,query));
}
/**
@@ -78,8 +87,8 @@
* @return 涓氬姟瀵硅薄
*/
@Override
- @GetMapping(GET_BY_IDS)
- public R<List<RevisionRuleVO>> selectByIdCollection(List<String> ids) {
+ @PostMapping(GET_BY_IDS)
+ public R<List<RevisionRuleVO>> selectByIdCollection(@RequestBody List<String> ids) {
return R.data(service.listRevisionRuleByIdCollection(ids));
}
@@ -94,4 +103,15 @@
public R<List<RevisionRuleVO>> listBtmTypeByOidCollection(Collection<String> oidCollection) {
return R.data(service.listRevisionRuleByOidCollection(oidCollection));
}
+
+ /**
+ * 鏍规嵁id鑾峰彇鐗堟湰瑙勫垯
+ * @param id
+ * @return
+ */
+ @Override
+ public R<RevisionRuleVO> selectById(@RequestParam("id") String id) {
+ return R.data(service.getReversionRuleById(id));
+ }
+
}
--
Gitblit v1.9.3