修改

xuhy

2024-12-30 3330e5853c74a51bfc0ca309de2b4bfd5d06e13a

修改

 manage/src/main/java/com/jilongda/manage/mapper/TLensWarehousingDetailMapper.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jilongda.manage.query.TWarehousingDetailLensQuery;
import com.jilongda.manage.vo.TLensWarehousingDetailVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -17,6 +18,7 @@
 * @author 无关风月
 * @since 2024-12-09
 */
@Mapper
public interface TLensWarehousingDetailMapper extends BaseMapper<TLensWarehousingDetail> {

    List<TLensWarehousingDetailVO> pageLensList(@Param("query")TWarehousingDetailLensQuery query,@Param("pageInfo") PageInfo<TLensWarehousingDetailVO> pageInfo);

 manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java

@@ -20,8 +20,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
@@ -45,10 +47,18 @@
    public PageInfo<TFrameWarehousingDetailVO> detailList(TWarehousingDetailQuery query) {
        PageInfo<TFrameWarehousingDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TFrameWarehousingDetailVO> list = frameWarehousingDetailMapper.pageList(query,pageInfo);
        List<Integer> storeIds = list.stream().map(TFrameWarehousingDetailVO::getStoreId).collect(Collectors.toList());
        List<TStore> stores = new ArrayList<>();
        if(CollectionUtils.isNotEmpty(storeIds)){
            stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
                    .in(TStore::getId,storeIds));
        }
        for (TFrameWarehousingDetailVO tFrameWarehousingDetailVO : list) {
            TStore tStore = storeMapper.selectById(tFrameWarehousingDetailVO.getStoreId());
            if(Objects.nonNull(tStore)){
                tFrameWarehousingDetailVO.setStoreName(tStore.getName());
            if(CollectionUtils.isNotEmpty(stores)){
                TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tFrameWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
                if(Objects.nonNull(store)){
                    tFrameWarehousingDetailVO.setStoreName(store.getName());
                }
            }
        }
        pageInfo.setRecords(list);
@@ -58,10 +68,18 @@
    public PageInfo<TLensWarehousingDetailVO> detailListLens(TWarehousingDetailLensQuery query) {
        PageInfo<TLensWarehousingDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TLensWarehousingDetailVO> list = lensWarehousingDetailMapper.pageLensList(query,pageInfo);
        for (TLensWarehousingDetailVO tFrameWarehousingDetailVO : list) {
            TStore tStore = storeMapper.selectById(tFrameWarehousingDetailVO.getStoreId());
            if(Objects.nonNull(tStore)){
                tFrameWarehousingDetailVO.setStoreName(tStore.getName());
        List<Integer> storeIds = list.stream().map(TLensWarehousingDetailVO::getStoreId).collect(Collectors.toList());
        List<TStore> stores = new ArrayList<>();
        if(CollectionUtils.isNotEmpty(storeIds)){
            stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
                    .in(TStore::getId,storeIds));
        }
        for (TLensWarehousingDetailVO tLensWarehousingDetailVO : list) {
            if(CollectionUtils.isNotEmpty(stores)){
                TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tLensWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
                if(Objects.nonNull(store)){
                    tLensWarehousingDetailVO.setStoreName(store.getName());
                }
            }
        }
        pageInfo.setRecords(list);

 manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml

@@ -28,7 +28,7 @@
    </sql>
    <select id="pageLensList" resultType="com.jilongda.manage.vo.TLensWarehousingDetailVO">
        select tlwd.id, tlwd.warehousingId, tlwd.brand, tlwd.supplier, tlwd.series, tlwd.total, tlwd.refractiveIndex, tlwd.ballMirror, tlwd.code, tlwd.createTime,tlwd.columnMirror,
        tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`
        tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`,tw.storeId
        from t_lens_warehousing_detail tlwd
        left join t_warehousing tw on tlwd.warehousingId = tw.id
        <where>