产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liyong
2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd 
 src/main/java/com/ruoyi/staff/service/impl/PersonalShiftServiceImpl.java


@@ -2,26 +2,22 @@




import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.date.DateTime;


import cn.hutool.core.date.DateUtil;


import cn.hutool.core.util.StrUtil;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.project.system.domain.SysDictData;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.staff.dto.PerformanceShiftAddDto;


import com.ruoyi.staff.dto.PerformanceShiftMapDto;


import com.ruoyi.staff.mapper.PersonalAttendanceLocationConfigMapper;


import com.ruoyi.staff.mapper.PersonalShiftMapper;


import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;


import com.ruoyi.staff.pojo.PersonalShift;


import com.ruoyi.staff.mapper.PersonalShiftMapper;


import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;


import com.ruoyi.staff.service.PersonalShiftService;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.staff.utils.JackSonUtil;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.factory.annotation.Autowired;


import lombok.RequiredArgsConstructor;


import org.springframework.stereotype.Service;


import cn.hutool.core.date.DateUtil;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;




@@ -29,7 +25,6 @@


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.YearMonth;


import java.time.ZoneId;


import java.time.format.DateTimeFormatter;


import java.time.temporal.TemporalAdjusters;


@@ -46,10 +41,10 @@


 */


@Service


@Transactional(rollbackFor = Exception.class)


@RequiredArgsConstructor


public class PersonalShiftServiceImpl extends ServiceImpl<PersonalShiftMapper, PersonalShift> implements PersonalShiftService {




    @Autowired


    private PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;


    private final PersonalAttendanceLocationConfigMapper personalAttendanceLocationConfigMapper;




    @Override


    public int performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto) {


@@ -228,6 +223,9 @@


            for (String shiftTime : shiftTimes) {


                Map<String, Object> hashMap = new HashMap<>();


                String[] shiftTimeAndShift = shiftTime.split("：");


                if(shiftTimeAndShift.length != 3){


                    continue;


                }


                for (PersonalAttendanceLocationConfig personalAttendanceLocationConfig : personalAttendanceLocationConfigs) {


                    if (!i.getMonthlyAttendance().containsKey(personalAttendanceLocationConfig.getShift())) {


                        i.getMonthlyAttendance().put(personalAttendanceLocationConfig.getShift(), 0);


@@ -258,6 +256,16 @@


        LocalDateTime localDateTime = LocalDateTime.parse(time, formatters);


        map.put("header", getMonthHeader(localDateTime));


        List<List<Object>> lists = dataRequiredForProcessingIntoExcelMonth(mapIPage, personalAttendanceLocationConfigs);


        int maxSize = lists.stream()


                .mapToInt(List::size)


                .max()


                .orElse(0);




        for (List<Object> row : lists) {


            while (row.size() < maxSize) {


                row.add("-");


            }


        }


        map.put("data", lists);


        return map;


    }