Crunchy
2024-05-08 f6fd1f8aed6e7bb0c4dce40cf1cc48b8f4597432
2024-5-8 绩效管理-班次后端开发完成
已修改2个文件
30 ■■■■■ 文件已修改
performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftAddDto.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftAddDto.java
@@ -3,20 +3,25 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@Data
public class PerformanceShiftAddDto {
    @NotNull(message = "请选择班次")
    @ApiModelProperty("班次")
    private String shift;
    @NotNull(message = "请选择员工")
    @ApiModelProperty("员工id")
    private Integer userId;
    private String userId;
    @NotNull(message = "请选择周次")
    @ApiModelProperty("开始周次")
    private LocalDateTime startWeek;
    @NotNull(message = "请选择周次")
    @ApiModelProperty("结束周次")
    private LocalDateTime endWeek;
}
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
@@ -36,11 +36,14 @@
    public void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto) {
        List<LocalDateTime> datesBetween = getLocalDateTimesBetween(performanceShiftAddDto.getStartWeek(), performanceShiftAddDto.getEndWeek());
        for (LocalDateTime date : datesBetween) {
            PerformanceShift performanceShift = new PerformanceShift();
            performanceShift.setShift(performanceShiftAddDto.getShift());
            performanceShift.setUserId(performanceShiftAddDto.getUserId());
            performanceShift.setWorkTime(date);
            baseMapper.insert(performanceShift);
            String[] splitUserId = performanceShiftAddDto.getUserId().split(",");
            for (String s : splitUserId) {
                PerformanceShift performanceShift = new PerformanceShift();
                performanceShift.setShift(performanceShiftAddDto.getShift());
                performanceShift.setUserId(Integer.valueOf(s));
                performanceShift.setWorkTime(date);
                baseMapper.insert(performanceShift);
            }
        }
    }
@@ -53,17 +56,13 @@
            int totalAttendance = 0;
            Map<Object, Object> map = new HashMap<>();
            for (Enums enums : shiftType) {
                Integer num = 0;
                int num = 0;
                // 分割日期
                for (String shiftTime : shiftTimes) {
                    Map<Object, Object> hashMap = new HashMap<>();
                    String[] shiftTimeAndShift = shiftTime.split(":");
                    if (enums.getValue().equals(shiftTimeAndShift[1])) {
                        num++;
                    }
                    // 3:休假;4:请假
                    if (!enums.getValue().equals("3") && enums.getValue().equals("4")) {
                        totalAttendance++;
                    }
                    hashMap.put("id", shiftTimeAndShift[2]);
                    hashMap.put("shift", shiftTimeAndShift[1]);
@@ -73,7 +72,9 @@
                }
                i.put(enums.getLabel(), num);
                i.put("list", map);
                i.put("totalAttendance", totalAttendance);
                if(!enums.getValue().equals("3") && !enums.getValue().equals("4")) {
                    i.put("totalAttendance", totalAttendance += num);
                }
                i.remove("shiftTime");
            }
        }