yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询条件

This commit is contained in:
yangjun 2025-05-19 13:36:05 +08:00
parent b41f9a3648
commit 83b0db735a
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java
View File

@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
@ -83,6 +85,8 @@ public class ConfigMaterialCategoryController extends JeecgController<ConfigMate
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ConfigMaterialCategory> queryWrapper = QueryGenerator.initQueryWrapper(configMaterialCategory, req.getParameterMap());
queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getCategoryId()),"category_id",configMaterialCategory.getCategoryId());
queryWrapper.eq(StringUtils.isNotBlank(configMaterialCategory.getTypeId()),"type_id",configMaterialCategory.getTypeId());
Page<ConfigMaterialCategory> page = new Page<ConfigMaterialCategory>(pageNo, pageSize);
IPage<ConfigMaterialCategory> pageList = configMaterialCategoryService.selectMaterialList(page, queryWrapper);
return Result.OK(pageList);

24
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java
View File

@ -37,19 +37,21 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
public IPage<ConfigMaterialCategory> selectMaterialList(Page<ConfigMaterialCategory> page, QueryWrapper<ConfigMaterialCategory> queryWrapper) {
IPage<ConfigMaterialCategory> pageList = baseMapper.selectMaterialList(page,queryWrapper);
List<ConfigMaterialCategory> list = pageList.getRecords();
//按照list 的categoryId字段获取相同数据开始和结束标记
String categoryId = list.get(0).getCategoryId();
int outerStart = 0; // 一级分组起始索引
for (int i = 0; i < list.size(); i++) {
ConfigMaterialCategory configMaterialCategory = list.get(i);
// 当遇到不同的categoryId时处理当前分组
if (!configMaterialCategory.getCategoryId().equals(categoryId)) {
processAllGroups(list, outerStart, i - 1); // 处理完整个一级分组
outerStart = i; // 重置一级起始位置
categoryId = configMaterialCategory.getCategoryId();
if(list.size()>0){
//按照list 的categoryId字段获取相同数据开始和结束标记
String categoryId = list.get(0).getCategoryId();
int outerStart = 0; // 一级分组起始索引
for (int i = 0; i < list.size(); i++) {
ConfigMaterialCategory configMaterialCategory = list.get(i);
// 当遇到不同的categoryId时处理当前分组
if (!configMaterialCategory.getCategoryId().equals(categoryId)) {
processAllGroups(list, outerStart, i - 1); // 处理完整个一级分组
outerStart = i; // 重置一级起始位置
categoryId = configMaterialCategory.getCategoryId();
}
}
processAllGroups(list, outerStart, list.size() - 1); // 处理最后一组
}
processAllGroups(list, outerStart, list.size() - 1); // 处理最后一组
return pageList;
}