Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 29e5ce7e230beb96c06105c7baa530c6b9279508

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetHouseInspectionRecordServiceImpl.java

@@ -1,10 +1,27 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.system.mapper.AssetHouseInspectionDetailMapper;
import com.ruoyi.system.mapper.AssetHouseInspectionItemMapper;
import com.ruoyi.system.mapper.AssetHouseInspectionRecordMapper;
import com.ruoyi.system.model.AssetHouseInspectionDetail;
import com.ruoyi.system.model.AssetHouseInspectionItem;
import com.ruoyi.system.model.AssetHouseInspectionRecord;
import com.ruoyi.system.query.AssetHouseInspectionRecordListQuery;
import com.ruoyi.system.service.AssetHouseInspectionRecordService;
import com.ruoyi.system.vo.AssetHouseInspectionVO;
import com.ruoyi.system.vo.AssetRepairRequestVO;
import com.ruoyi.system.vo.system.ApprovalVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * <p>
@@ -17,4 +34,24 @@
@Service
public class AssetHouseInspectionRecordServiceImpl extends ServiceImpl<AssetHouseInspectionRecordMapper, AssetHouseInspectionRecord> implements AssetHouseInspectionRecordService {

    @Autowired
    private AssetHouseInspectionDetailMapper assetHouseInspectionDetailMapper;
    @Autowired
    private AssetHouseInspectionItemMapper assetHouseInspectionItemMapper;
    @Override
    public PageInfo<AssetHouseInspectionVO> pageList(AssetHouseInspectionRecordListQuery query) {
//        List<AssetHouseInspectionItem> assetHouseInspectionItems = assetHouseInspectionItemMapper.selectList(null);
        PageInfo<AssetHouseInspectionVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<AssetHouseInspectionVO> list = this.baseMapper.pageList(query,pageInfo);

//        List<Integer> inspectionIds = list.stream().map(AssetHouseInspectionRecord::getId).collect(Collectors.toList());
//        if (!inspectionIds.isEmpty()){
//            Map<Integer, List<AssetHouseInspectionDetail>> detailMaps = assetHouseInspectionDetailMapper.selectList(
//                    new LambdaQueryWrapper<AssetHouseInspectionDetail>()
//                            .in(AssetHouseInspectionDetail::getInspectionRecordId, inspectionIds)
//            ).stream().collect(Collectors.groupingBy(AssetHouseInspectionDetail::getInspectionRecordId));
//        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
}