From a7a8a50f48c1bff5ddc52b3bad1782328f8043d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 12 四月 2024 18:50:20 +0800
Subject: [PATCH] 基础数据配置接口修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
index e485974..35b6d48 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbFieldServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
@@ -157,7 +158,56 @@
if (CollUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
+ List<TbField> collect = page.getRecords().stream().peek(item -> {
+ if (StringUtils.isBlank(item.getLevelTwoCategory())) {
+ item.setLevelTwoCategory("无");
+ item.setLevelThreeCategory("无");
+ } else {
+ item.setLevelThreeCategory("无");
+ }
+ }).collect(Collectors.toList());
+ page.setRecords(collect);
return PageDTO.of(page, FieldVO.class);
+ }
+
+ @Override
+ public PageDTO<FieldVO> queryShowPage(FieldQuery query) {
+ Page<TbField> page = this.lambdaQuery()
+ .select(TbField::getId, TbField::getFieldName, TbField::getLevelOneCategory,
+ TbField::getLevelTwoCategory, TbField::getLevelThreeCategory)
+ .like(StringUtils.isNotEmpty(query.getFieldName()), TbField::getFieldName,
+ query.getFieldName())
+ .like(StringUtils.isNotEmpty(query.getLevelOneCategory()),
+ TbField::getLevelOneCategory, query.getLevelOneCategory())
+ .like(StringUtils.isNotEmpty(query.getLevelTwoCategory()),
+ TbField::getLevelTwoCategory, query.getLevelTwoCategory())
+ .like(StringUtils.isNotEmpty(query.getLevelThreeCategory()),
+ TbField::getLevelThreeCategory, query.getLevelThreeCategory())
+ .eq(TbField::getStatus, ShowStatusEnum.SHOW)
+ .eq(StringUtils.isNotNull(query.getFieldType()), TbField::getFieldType,
+ query.getFieldType())
+ .orderByDesc(TbField::getCreateTime)
+ .page(new Page<>(query.getPageNum(), query.getPageSize()));
+ if (CollUtils.isEmpty(page.getRecords())) {
+ return PageDTO.empty(page);
+ }
+ List<TbField> collect = page.getRecords().stream().peek(item -> {
+ if (StringUtils.isBlank(item.getLevelTwoCategory())) {
+ item.setLevelTwoCategory("无");
+ item.setLevelThreeCategory("无");
+ } else {
+ item.setLevelThreeCategory("无");
+ }
+ }).collect(Collectors.toList());
+ page.setRecords(collect);
+ return PageDTO.of(page, FieldVO.class);
+ }
+
+ @Override
+ public List<FieldVO> listFields() {
+ List<TbField> list = this.list(
+ Wrappers.<TbField>lambdaQuery().eq(TbField::getStatus, ShowStatusEnum.SHOW));
+ return BeanUtils.copyList(list, FieldVO.class);
}
@Override
@@ -184,7 +234,7 @@
}
@Override
- public void update(FieldUpdateDTO dto) {
+ public void editField(FieldUpdateDTO dto) {
TbField field = this.getById(dto.getId());
if (Objects.isNull(field)) {
throw new ServiceException("参数异常");
--
Gitblit v1.7.1