From 1734f2d56162a1fdb556632dc36fcef0ca57851c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 十二月 2024 11:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/service/impl/TOptometristServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 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..e8b3e46 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,20 @@
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.model.SecFeeItems;
import com.jilongda.manage.model.TOptometrist;
import com.jilongda.manage.mapper.TOptometristMapper;
+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 +40,17 @@
}
@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;
+ }
+
+ @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);
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1