From 529738fcb3e08b40e6065dd8f2eb679d08e402a3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 十二月 2023 12:14:06 +0800
Subject: [PATCH] 254，完善，编码回收记录业务数据到codeallcode表总
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java
index 26da663..f99941a 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java
@@ -4,12 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.log.exception.ServiceException;
+import com.vci.ubcs.system.entity.Combination;
import com.vci.ubcs.system.mapper.CombinationMapper;
import com.vci.ubcs.system.service.ICombinationService;
import org.springblade.core.cache.utils.CacheUtil;
-import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
-import com.vci.ubcs.system.entity.Combination;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -55,7 +56,9 @@
*/
@Override
public IPage<Combination> selectCombinationPage(Combination combination, IPage<Combination> page) {
- return page.setRecords(combinationMapper.selectCombinationPage(page,combination));
+ IPage<Combination> combinationIPage = combinationMapper.selectPage(page, Condition.getQueryWrapper(combination));
+ // page.setRecords(combinationMapper.selectCombinationPage(page,combination))
+ return combinationIPage;
}
/**
@@ -110,7 +113,9 @@
*/
@Override
public List<Map<String, Object>> selectMaps() {
- List<Map<String, Object>> maps = listMaps(new QueryWrapper<Combination>().select("ID", "NAME"));
+ List<Map<String, Object>> maps = listMaps(
+ new QueryWrapper<Combination>().lambda().select(Combination::getId, Combination::getName)
+ );
return maps;
}
--
Gitblit v1.9.3