From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批：待审批节点，第三人账号不可进行修改 2.营销管理-销售台账：勾选单个导出会出现整个导出的情况，但只能显示父项、不能显示子项 3.营销管理-销售台账：点击下拉没有价格，点击详情有价格
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
index d6504a1..1cdd838 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+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.ruoyi.collaborativeApproval.dto.NoticeDTO;
@@ -10,6 +11,7 @@
import com.ruoyi.collaborativeApproval.service.NoticeService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -40,17 +42,14 @@
@Override
public List<NoticeDTO> selectCount() {
+ List<Notice> notices = noticeMapper.selectList(Wrappers.lambdaQuery(Notice.class).groupBy(Notice::getType));
List<NoticeDTO> result = new ArrayList<>();
- NoticeDTO notice = new NoticeDTO();
- notice.setType(1);
- notice.setCount(noticeMapper.selectCount(new LambdaQueryWrapper<Notice>().eq(Notice::getType, 1)));
- result.add(notice);
-
- NoticeDTO notice1 = new NoticeDTO();
- notice1.setType(2);
- notice1.setCount(noticeMapper.selectCount(new LambdaQueryWrapper<Notice>().eq(Notice::getType, 2)));
- result.add(notice1);
-
+ for (Notice notice : notices) {
+ NoticeDTO notice1 = new NoticeDTO();
+ BeanUtils.copyProperties(notice, notice1);
+ notice1.setCount(noticeMapper.selectCount(new LambdaQueryWrapper<Notice>().eq(Notice::getType, notice.getType())));
+ result.add(notice1);
+ }
return result;
}
}
--
Gitblit v1.9.3