更新

whycxzp

2023-05-19 49a95a8c4aeaddee1beabd1483607c3fcb68aaab

更新

 src/main/java/com/whyc/mapper/FaultUploadMapper.java

@@ -1,7 +1,6 @@
package com.whyc.mapper;

import com.whyc.pojo.FaultUpload;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -10,6 +9,6 @@
    List<FaultUpload> getList(int userId,FaultUpload upload);
    List<FaultUpload> getList2(int userId,FaultUpload upload);

    List<FaultUpload> getListWithGroupName(int userId);
    List<FaultUpload> getListWithGroupName(int userId, int year);

}

 src/main/java/com/whyc/service/FaultUploadService.java

@@ -329,7 +329,8 @@
        Map<String,FaultUpload> resMap = new HashMap<>();

        int userId = ActionUtil.getUser().getUId().intValue();
        List<FaultUpload> list = mapper.getListWithGroupName(userId);
        int year = Calendar.getInstance().get(Calendar.YEAR);
        List<FaultUpload> list = mapper.getListWithGroupName(userId,year);
        Map<String, List<FaultUpload>> userListMap = list.stream().collect(Collectors.groupingBy(FaultUpload::getUploadUserName));
        Set<String> userNameSet = userListMap.keySet();
        for (String userName : userNameSet) {

 src/main/resources/mapper/FaultUploadMapper.xml

@@ -103,6 +103,7 @@
        and bb.baoji_group_id = g.baoji_group_id
        and u.upload_user_id = user.uId
        and g.discharge_plan_flag = 1
        and u.create_time like '${year}%'
        and station_id in
        (
            select distinct stationId