From 59099ec96f7a2da11df4b0b1593092b0aff38e90 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 13:45:52 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpIssueReportingServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpIssueReportingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpIssueReportingServiceImpl.java
index bb43f7c..eeda498 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpIssueReportingServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpIssueReportingServiceImpl.java
@@ -1,10 +1,23 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.mapper.TCrmClinicMapper;
+import com.ruoyi.system.mapper.TCrmSupplierMapper;
import com.ruoyi.system.mapper.TErpIssueReportingMapper;
+import com.ruoyi.system.model.TCrmClinic;
+import com.ruoyi.system.model.TCrmSupplier;
+import com.ruoyi.system.model.TErpGoodsType;
import com.ruoyi.system.model.TErpIssueReporting;
+import com.ruoyi.system.query.TErpIssueReportingQuery;
import com.ruoyi.system.service.TErpIssueReportingService;
+import com.ruoyi.system.vo.TErpIssueReportingVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +30,36 @@
@Service
public class TErpIssueReportingServiceImpl extends ServiceImpl<TErpIssueReportingMapper, TErpIssueReporting> implements TErpIssueReportingService {
+ @Autowired
+ private TCrmSupplierMapper crmSupplierMapper;
+ @Autowired
+ private TCrmClinicMapper crmClinicMapper;
+
+ @Override
+ public PageInfo<TErpIssueReportingVO> pageList(TErpIssueReportingQuery query) {
+ PageInfo<TErpIssueReportingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(query.getReportStartTime()!=null && !query.getReportStartTime().isEmpty() && query.getReportEndTime()!=null && !query.getReportEndTime().isEmpty()){
+ query.setReportStartTime(query.getReportStartTime()+" 00:00:00");
+ query.setReportEndTime(query.getReportEndTime()+" 23:59:59");
+ }
+ List<TErpIssueReportingVO> list = this.baseMapper.pageList(query,pageInfo);
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+ List<String> reportUserIds = list.stream().map(TErpIssueReportingVO::getReportUserId).collect(Collectors.toList());
+ List<TCrmSupplier> crmSuppliers = crmSupplierMapper.selectBatchIds(reportUserIds);
+ List<TCrmClinic> crmClinics = crmClinicMapper.selectBatchIds(reportUserIds);
+ for (TErpIssueReportingVO tErpIssueReportingVO : list) {
+ switch (tErpIssueReportingVO.getReportType()) {
+ case 1:
+ crmSuppliers.stream().filter(t -> t.getId().equals(tErpIssueReportingVO.getReportUserId())).findFirst().ifPresent(t -> tErpIssueReportingVO.setSupplierClinicName(t.getSupplierName()));
+ break;
+ case 2:
+ crmClinics.stream().filter(t -> t.getId().equals(tErpIssueReportingVO.getReportUserId())).findFirst().ifPresent(t -> tErpIssueReportingVO.setSupplierClinicName(t.getClinicName()));
+ break;
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1