From 875e26a11e28c1cefc1667bc25985dbb049f91f3 Mon Sep 17 00:00:00 2001
From: zhangxp <zhangxp@chicecm.com>
Date: 星期五, 16 六月 2023 18:34:01 +0800
Subject: [PATCH] 修复
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
index 6bd5b0d..0e9b55b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
@@ -148,8 +148,7 @@
@Override
public List<RevisionRuleVO> listRevisionRuleByIdCollection(Collection<String> revisionRuleIdCollection) throws VciBaseException {
VciBaseUtil.alertNotNull(revisionRuleIdCollection,"鑻辨枃鍚嶇О闆嗗悎");
-// return RevisionRuleWrapper.build().listVO(list(MybatisParameterUtil.cutInParameter(Wrappers.<RevisionRule>query().lambda(),RevisionRule::getId, Collections.singletonList(revisionRuleIdCollection))));
- List<RevisionRule> list = baseMapper.selectList(Wrappers.<RevisionRule>query().lambda().in(RevisionRule::getId, revisionRuleIdCollection));
+ List<RevisionRule> list = baseMapper.selectByIdIgnoreCase(revisionRuleIdCollection);
return RevisionRuleWrapper.build().listVO(list);
}
@@ -545,19 +544,19 @@
* @throws VciBaseException 鏌ヨ鍑洪敊鏃舵姏鍑哄紓甯�
*/
@Override
- public IPage<RevisionRuleVO> pageQueryVO(BaseQueryObject baseQueryObject) throws VciBaseException {
- Map<String, String> conditionMap = baseQueryObject.getConditionMap();
- if (conditionMap == null){
- conditionMap = new HashMap<>();
- }
- PageHelper pageHelper = baseQueryObject.getPageHelper();
- Query query = new Query();
- query.setCurrent(pageHelper.getPage());
- query.setSize(pageHelper.getLimit());
- query.setAscs(pageHelper.getSort());
- RevisionRule queryConditionObj = new RevisionRule();
- BeanMap beanMap = BeanMap.create(queryConditionObj);
- beanMap.putAll(conditionMap);
- return RevisionRuleWrapper.build().pageVO(baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(queryConditionObj).lambda().orderByAsc(RevisionRule::getId)));
+ public IPage<RevisionRuleVO> pageQueryVO(Map<String, Object> condition, Query query) throws VciBaseException {
+ return RevisionRuleWrapper.build().pageVO(baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(condition,RevisionRule.class).lambda().orderByAsc(RevisionRule::getId)));
+ }
+
+ /**
+ * 鏌ョ湅搴旂敤鑼冨洿
+ *
+ * @param id id
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public List<BtmTypeVO> getApplyRange(String id) {
+ VciBaseUtil.alertNotNull(id,"鐗堟湰瑙勫垯鑻辨枃鍚嶇О");
+ return BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().eq(BtmType::getRevisionRuleId,id)));
}
}
--
Gitblit v1.9.3