From 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:44:10 +0800
Subject: [PATCH] bug修改

---
 manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java
index 0b322dc..cd3c719 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java
@@ -1,12 +1,22 @@
 package com.jilongda.manage.service.impl;
 
 import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.mapper.TOptometryMapper;
+import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.mapper.TStoreMapper;
 import com.jilongda.manage.model.SecFeeItems;
 import com.jilongda.manage.model.TOptometrist;
 import com.jilongda.manage.mapper.TOptometristMapper;
+import com.jilongda.manage.model.TStore;
+import com.jilongda.manage.query.TOptometryQuery;
 import com.jilongda.manage.query.TOptometristQuery;
 import com.jilongda.manage.service.TOptometristService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jilongda.manage.vo.TOptometryVO;
+import com.jilongda.manage.vo.TSupplierVO;
+import org.apache.poi.ss.formula.functions.T;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.jilongda.manage.vo.TOptometristVO;
 import com.jilongda.manage.vo.TStoreVO;
 import org.springframework.stereotype.Service;
@@ -32,9 +42,23 @@
     }
 
     @Override
-    public PageInfo<TOptometristVO> pageList(TOptometristQuery query) {
+    public PageInfo<TOptometryVO> pageList(TOptometryQuery query) {
+        PageInfo<TOptometryVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TOptometryVO> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords(list);
+        return pageInfo;
+    }
+
+    @Autowired
+    private TStoreMapper storeMapper;
+    @Override
+    public PageInfo<TOptometristVO> pageList1(TOptometristQuery query) {
         PageInfo<TOptometristVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
-        List<TOptometristVO> list = this.baseMapper.pageList(query,pageInfo);
+        List<TOptometristVO> list = this.baseMapper.pageList1(query,pageInfo);
+        for (TOptometristVO tOptometristVO : list) {
+            TStore storeVO = storeMapper.selectById(tOptometristVO.getStoreId());
+            if (storeVO!=null)tOptometristVO.setStoreName(storeVO.getName());
+        }
         pageInfo.setRecords(list);
         return pageInfo;
     }

--
Gitblit v1.7.1