Crunchy
2024-05-09 525c64ef476b367b3ded1b9205788a183c2e810b
2024-5-9 绩效管理-班次后端开发调整完成
已修改4个文件
已添加1个文件
159 ■■■■ 文件已修改
performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.yuanchu.mom.dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Data
public class PerformanceShiftMapDto {
    private String name;
    private String shiftTime;
    private String userId;
    private Map<String, Object> monthlyAttendance = new HashMap<>();
    private Map<String, Object> sidebarAnnualAttendance = new HashMap<>();;
    private List<?> list = new ArrayList<>();
}
performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.PerformanceShiftMapDto;
import com.yuanchu.mom.mybatis_config.MyBaseMapper;
import com.yuanchu.mom.pojo.PerformanceShift;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Map;
/**
@@ -18,10 +20,14 @@
 */
public interface PerformanceShiftMapper extends MyBaseMapper<PerformanceShift> {
    IPage<Map<String, Object>> performanceShiftPage(
    IPage<PerformanceShiftMapDto> performanceShiftPage(
            Page<Object> page,
            @Param("time") String time,
            @Param("userName") String userName,
            @Param("laboratory") String laboratory
    );
    List<Map<String, Object>> performanceShiftYearPage(@Param("time") String time,
                                                       @Param("userName") String userName,
                                                       @Param("laboratory") String laboratory);
}
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
@@ -4,9 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
import com.yuanchu.mom.dto.PerformanceShiftMapDto;
import com.yuanchu.mom.pojo.PerformanceShift;
import java.util.Map;
/**
 * <p>
@@ -20,7 +19,7 @@
    void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);
    IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
    IPage<PerformanceShiftMapDto> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
    void performanceShiftUpdate(String shift, Integer id);
}
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
@@ -1,11 +1,13 @@
package com.yuanchu.mom.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
import com.yuanchu.mom.dto.PerformanceShiftMapDto;
import com.yuanchu.mom.mapper.PerformanceShiftMapper;
import com.yuanchu.mom.pojo.Enums;
import com.yuanchu.mom.pojo.PerformanceShift;
@@ -43,29 +45,32 @@
    public void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto) {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        String formattedDateTime = performanceShiftAddDto.getStartWeek().format(formatter);
        boolean exists = baseMapper.exists(Wrappers.<PerformanceShift>lambdaQuery()
                .eq(PerformanceShift::getWorkTime, formattedDateTime));
        String[] splitUserId = performanceShiftAddDto.getUserId().split(",");
        // å¦‚果不存在添加数据
        if (!exists) {
            LocalDate firstDayOfMonth = performanceShiftAddDto.getEndWeek().toLocalDate().withDayOfMonth(1);
            LocalDate lastDayOfMonth = performanceShiftAddDto.getEndWeek().toLocalDate().with(TemporalAdjusters.lastDayOfMonth());
            List<LocalDateTime> localDateTimesBetween = getLocalDateTimesBetween(firstDayOfMonth.atStartOfDay(), lastDayOfMonth.atStartOfDay());
            localDateTimesBetween.forEach(i -> {
                for (String s : splitUserId) {
                    PerformanceShift performanceShift = new PerformanceShift();
                    performanceShift.setUserId(Integer.valueOf(s));
                    performanceShift.setWorkTime(i);
                    performanceShift.setShift("");
                    list.add(performanceShift);
                }
                if (list.size() >= 1000) {
        for (String userId : splitUserId) {
            boolean exists = baseMapper.exists(Wrappers.<PerformanceShift>lambdaQuery()
                    .eq(PerformanceShift::getWorkTime, formattedDateTime)
                    .eq(PerformanceShift::getUserId, userId));
            // å¦‚果不存在添加数据
            if (!exists) {
                LocalDate firstDayOfMonth = performanceShiftAddDto.getEndWeek().toLocalDate().withDayOfMonth(1);
                LocalDate lastDayOfMonth = performanceShiftAddDto.getEndWeek().toLocalDate().with(TemporalAdjusters.lastDayOfMonth());
                List<LocalDateTime> localDateTimesBetween = getLocalDateTimesBetween(firstDayOfMonth.atStartOfDay(), lastDayOfMonth.atStartOfDay());
                localDateTimesBetween.forEach(i -> {
                    for (String s : splitUserId) {
                        PerformanceShift performanceShift = new PerformanceShift();
                        performanceShift.setUserId(Integer.valueOf(s));
                        performanceShift.setWorkTime(i);
                        performanceShift.setShift("");
                        list.add(performanceShift);
                    }
                    if (list.size() >= 1000) {
                        baseMapper.insertBatchSomeColumn(list);
                        list.clear();
                    }
                });
                if (!list.isEmpty()) {
                    baseMapper.insertBatchSomeColumn(list);
                    list.clear();
                }
            });
            if (!list.isEmpty()) {
                baseMapper.insertBatchSomeColumn(list);
            }
        }
        // å†æ¬¡æ›´æ–°
@@ -86,11 +91,12 @@
    }
    @Override
    public IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
        IPage<Map<String, Object>> mapIPage = baseMapper.performanceShiftPage(page, time, userName, laboratory);
    public IPage<PerformanceShiftMapDto> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
        IPage<PerformanceShiftMapDto> mapIPage = baseMapper.performanceShiftPage(page, time, userName, laboratory);
        List<Enums> shiftType = enumService.selectEnumByCategory("班次类型");
        for (Map<String, Object> i : mapIPage.getRecords()) {
            String[] shiftTimes = i.get("shiftTime").toString().split(";");
        List<Map<String, Object>> mapYearIPage = baseMapper.performanceShiftYearPage(time, userName, laboratory);
        mapIPage.getRecords().forEach(i -> {
            String[] shiftTimes = i.getShiftTime().split(";");
            int totalAttendance = 0;
            List<Object> map = new ArrayList<>();
            // åˆ†å‰²æ—¥æœŸ
@@ -98,27 +104,47 @@
                Map<Object, Object> hashMap = new HashMap<>();
                String[] shiftTimeAndShift = shiftTime.split(":");
                for (Enums enums : shiftType) {
                    if (!i.containsKey(enums.getLabel())) {
                        i.put(enums.getLabel(), 0);
                    if (!i.getMonthlyAttendance().containsKey(enums.getLabel())) {
                        i.getMonthlyAttendance().put(enums.getLabel(), 0);
                    }
                    if (enums.getValue().equals(shiftTimeAndShift[1])) {
                        Integer num = (Integer) i.get(enums.getLabel());
                        i.put(enums.getLabel(), num += 1);
                        Integer num = (Integer) i.getMonthlyAttendance().get(enums.getLabel());
                        i.getMonthlyAttendance().put(enums.getLabel(), num += 1);
                    }
                }
                if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0")) {
                    i.put("totalAttendance", totalAttendance += 1);
                    i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 1);
                }
                hashMap.put("id", shiftTimeAndShift[2]);
                hashMap.put("shift", shiftTimeAndShift[1]);
                hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.parse(shiftTimeAndShift[0])));
                DateTime parse = DateUtil.parse(shiftTimeAndShift[0]);
                hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1)));
                hashMap.put("time", shiftTimeAndShift[0]);
                hashMap.put("headerTime", getWeek(shiftTimeAndShift[0]));
                map.add(hashMap);
            }
            i.put("list", map);
            i.remove("shiftTime");
        }
            int totalYearAttendance = 0;
            Map<String, Object> hashMap = new HashMap<>();
            for (Map<String, Object> record : mapYearIPage) {
                if (record.get("user_id").toString().equals(i.getUserId())) {
                    for (Enums enums : shiftType) {
                        if (!hashMap.containsKey(enums.getLabel())) {
                            hashMap.put(enums.getLabel(), 0);
                        }
                        if (enums.getValue().equals(record.get("shift"))) {
                            Integer num = (Integer) hashMap.get(enums.getLabel());
                            hashMap.put(enums.getLabel(), num += 1);
                        }
                    }
                    if (record.get("shift").equals("1") || record.get("shift").equals("2") || record.get("shift").equals("0")) {
                        hashMap.put("totalAttendance", totalYearAttendance += 1);
                    }
                }
            }
            i.setSidebarAnnualAttendance(hashMap);
            i.setList(map);
            i.setShiftTime(null);
        });
        return mapIPage;
    }
@@ -127,7 +153,9 @@
        PerformanceShift performanceShift = new PerformanceShift();
        performanceShift.setId(id);
        performanceShift.setShift(shift);
        baseMapper.updateById(performanceShift);
        baseMapper.update(new PerformanceShift(), Wrappers.<PerformanceShift>lambdaUpdate()
                .eq(PerformanceShift::getId, id)
                .set(PerformanceShift::getShift, shift));
    }
    // èŽ·å–ä¸¤ä¸ªlocalDateTime的每一天
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -2,10 +2,16 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.PerformanceShiftMapper">
    <select id="performanceShiftPage" resultType="map">
    <resultMap id="performanceShiftPageMap" type="com.yuanchu.mom.dto.PerformanceShiftMapDto">
        <result column="name" property="name"/>
        <result column="shift_time" property="shiftTime"/>
        <result column="user_id" property="userId" />
    </resultMap>
    <select id="performanceShiftPage" resultMap="performanceShiftPageMap">
        SELECT
        if(u.department is not null and u.department != '', CONCAT(u.name, '(', u.department, ')'), u.name) name,
        GROUP_CONCAT(s.work_time, ':', s.shift, ':', s.id order by s.work_time SEPARATOR ';') AS shiftTime
        GROUP_CONCAT(s.work_time, ':', s.shift, ':', s.id order by s.work_time SEPARATOR ';') AS shift_time, u.id user_id
        FROM performance_shift s
        LEFT JOIN user u on u.id = s.user_id
        <where>
@@ -20,4 +26,21 @@
        </where>
        GROUP BY u.id
    </select>
    <select id="performanceShiftYearPage" resultType="map">
        SELECT
        s.user_id, s.shift
        FROM performance_shift s
        LEFT JOIN user u on u.id = s.user_id
        where s.shift is not NULL
        and s.shift != ''
        <if test="time != null and time != ''">
            and DATE_FORMAT(s.work_time, '%Y') = DATE_FORMAT(#{time}, '%Y' )
        </if>
        <if test="userName != null and userName != ''">
            and u.name like concat('%', #{userName}, '%')
        </if>
        <if test="laboratory != null and laboratory != ''">
        </if>
    </select>
</mapper>