From 65948198a6dc5e808440ac6874db6df8aab6d9ab Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 23 十二月 2024 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/service/impl/TLensSeriesServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TLensSeriesServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TLensSeriesServiceImpl.java
index 2f72a63..0b25a2b 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TLensSeriesServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TLensSeriesServiceImpl.java
@@ -1,8 +1,10 @@
package com.jilongda.manage.service.impl;
import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.mapper.TSupplierMapper;
import com.jilongda.manage.model.TLensSeries;
import com.jilongda.manage.mapper.TLensSeriesMapper;
+import com.jilongda.manage.model.TSupplier;
import com.jilongda.manage.query.TLensSeriesQuery;
import com.jilongda.manage.service.TLensSeriesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,6 +12,7 @@
import com.jilongda.manage.vo.TOptometristVO;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -23,10 +26,16 @@
@Service
public class TLensSeriesServiceImpl extends ServiceImpl<TLensSeriesMapper, TLensSeries> implements TLensSeriesService {
+ @Resource
+ private TSupplierMapper supplierMapper;
@Override
public PageInfo<TLensSeriesVO> pageList(TLensSeriesQuery query) {
PageInfo<TLensSeriesVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TLensSeriesVO> list = this.baseMapper.pageList(query,pageInfo);
+ for (TLensSeriesVO tLensSeriesVO : list) {
+ TSupplier tSupplier = supplierMapper.selectById(tLensSeriesVO.getSupplierId());
+ if (tSupplier!=null)tLensSeriesVO.setSupplier(tSupplier.getName());
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1