From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysInspectionServiceImpl.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysInspectionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysInspectionServiceImpl.java
index 941f3ed..154533f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysInspectionServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysInspectionServiceImpl.java
@@ -1,10 +1,22 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.mapper.TCrmClinicMapper;
+import com.ruoyi.system.model.TCrmClinic;
import com.ruoyi.system.model.TSysInspection;
import com.ruoyi.system.mapper.TSysInspectionMapper;
+import com.ruoyi.system.query.TSysInspectionQuery;
import com.ruoyi.system.service.TSysInspectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.SysOperLogVO;
+import com.ruoyi.system.vo.TSysInspectionVO;
+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 +29,23 @@
@Service
public class TSysInspectionServiceImpl extends ServiceImpl<TSysInspectionMapper, TSysInspection> implements TSysInspectionService {
+ @Autowired
+ private TCrmClinicMapper crmClinicMapper;
+
+ @Override
+ public PageInfo<TSysInspectionVO> pageList(TSysInspectionQuery query) {
+ PageInfo<TSysInspectionVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TSysInspectionVO> list = this.baseMapper.pageList(query,pageInfo);
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+ List<String> clinicId = list.stream().map(TSysInspectionVO::getClinicId).collect(Collectors.toList());
+ List<TCrmClinic> crmClinics = crmClinicMapper.selectList(Wrappers.lambdaQuery(TCrmClinic.class)
+ .in(TCrmClinic::getId, clinicId));
+ for (TSysInspectionVO tSysInspectionVO : list) {
+ crmClinics.stream().filter(t -> t.getId().equals(tSysInspectionVO.getClinicId())).findFirst().ifPresent(t -> tSysInspectionVO.setClinicName(t.getClinicName()));
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1