Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 2fee40486f9473398be3c293e8311d45bd53adc9

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java

@@ -5,8 +5,11 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.exception.ServiceException;
@@ -133,10 +136,23 @@
                .eq(query.getStatus() != null, TTask::getStatus, query.getStatus())
                .in(query.getPatrolInspectorIds() != null && query.getPatrolInspectorIds().isEmpty(), TTask::getPatrolInspector, query.getPatrolInspectorIds())
                .in(query.getTaskIds() != null && query.getTaskIds().isEmpty(), TTask::getId, query.getTaskIds()).list();
        List<String> collect = list.stream().map(TTask::getId).collect(Collectors.toList());

        list = list.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
        pageInfo.setTotal(list.size());
        List<LocationListTaskVO> res = new ArrayList<>();
        List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)
                        .in(TTaskDetail::getTaskId,collect)
                .eq(TTaskDetail::getClearStatus, 2)
                .eq(TTaskDetail::getHandleType,1)
                .orderByDesc(TTaskDetail::getCreateTime));
        taskDetails = new ArrayList<>(taskDetails.stream()
                .collect(Collectors.groupingBy(
                        TTaskDetail::getTaskId,
                        Collectors.collectingAndThen(
                                Collectors.toList(),
                                listAll -> listAll.get(0)
                        )
                ))
                .values());
        for (TTask tTask : list) {
            LocationListTaskVO temp = new LocationListTaskVO();
            TLocation tLocation = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);
@@ -168,18 +184,26 @@
                        .ifPresent(tLocationType -> temp.setLocationTypeName(tLocationType.getLocationName()));

            }
            TTaskDetail one = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, tTask.getId())
                    .orderByDesc(TTaskDetail::getCreateTime).last("limit 1").one();
            if (one!=null){
                temp.setClearStatus(one.getClearStatus());
                temp.setPicture(one.getPicture());
            TTaskDetail tTaskDetail = taskDetails.stream().filter(e -> e.getTaskId().equals(tTask.getId())).findFirst().orElse(null);
            if (tTaskDetail!=null){
                temp.setPicture(tTaskDetail.getPicture());
                temp.setClearStatus(tTaskDetail.getClearStatus());
                if (query.getClearStatus()!=null){
                    if (query.getClearStatus().equals(tTaskDetail.getClearStatus())){
                        res.add(temp);
                    }
                }else{
                    res.add(temp);
                }
            }
            temp.setTaskType(tTask.getTaskType());
            temp.setStatus(tTask.getStatus());
            temp.setTaskId(tTask.getId());
            temp.setImplementTime(tTask.getImplementTime());
            res.add(temp);

        }
        res = res.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());
        pageInfo.setTotal(res.size());
        pageInfo.setRecords(res);
        return R.ok(pageInfo);
    }