From ccc3d1e45084d0c3204c22fbb3eb382fe8922d3e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 1 Apr 2026 23:54:50 +0800 Subject: [PATCH] ✨ feat(mes): 移除冗余的班组类型枚举引用及相关注释 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java | 3 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java | 3 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java | 7 ++----- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalCalendarTypeEnum.java | 37 ------------------------------------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java | 4 +--- 5 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalCalendarTypeEnum.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java index 98b5a01..5ead025 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.cal.plan; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.mes.enums.cal.MesCalCalendarTypeEnum; import cn.iocoder.yudao.module.mes.enums.cal.MesCalPlanStatusEnum; import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftMethodEnum; import cn.iocoder.yudao.module.mes.enums.cal.MesCalShiftTypeEnum; @@ -42,8 +41,6 @@ public class MesCalPlanDO extends BaseDO { private String name; /** * 班组类型 - * - * 枚举 {@link MesCalCalendarTypeEnum} */ private Integer calendarType; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java index 51b3fcd..fba0ccc 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.cal.team; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.mes.enums.cal.MesCalCalendarTypeEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -37,8 +36,6 @@ public class MesCalTeamDO extends BaseDO { private String name; /** * 班组类型 - * - * 枚举 {@link MesCalCalendarTypeEnum} */ private Integer calendarType; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java index 329e6f8..bbee278 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java @@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.shift.MesCalTeam import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamShiftDO; import org.apache.ibatis.annotations.Mapper; -import java.time.LocalDateTime; import java.util.List; /** @@ -27,10 +26,8 @@ public interface MesCalTeamShiftMapper extends BaseMapperX { .orderByAsc(MesCalTeamShiftDO::getSort)); } - default MesCalTeamShiftDO selectByDayAndTeamId(LocalDateTime day, Long teamId) { - return selectOne(new LambdaQueryWrapperX() - .eq(MesCalTeamShiftDO::getDay, day) - .eq(MesCalTeamShiftDO::getTeamId, teamId)); + default List selectListByPlanId(Long planId) { + return selectList(MesCalTeamShiftDO::getPlanId, planId); } default void deleteByPlanId(Long planId) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalCalendarTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalCalendarTypeEnum.java deleted file mode 100644 index e9f6867..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalCalendarTypeEnum.java +++ /dev/null @@ -1,37 +0,0 @@ -package cn.iocoder.yudao.module.mes.enums.cal; - -import cn.iocoder.yudao.framework.common.core.ArrayValuable; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Arrays; - -/** - * MES 班组类型（日历类型）枚举 - * - * @author 芋道源码 - */ -@Getter -@AllArgsConstructor -public enum MesCalCalendarTypeEnum implements ArrayValuable { - - GROUP_ROTATION(1, "分组轮班"), - FIXED_TEAM(2, "固定班组"); - - public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesCalCalendarTypeEnum::getType).toArray(Integer[]::new); - - /** - * 类型值 - */ - private final Integer type; - /** - * 类型名 - */ - private final String name; - - @Override - public Integer[] array() { - return ARRAYS; - } - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java index 227ac33..885ebd9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java @@ -83,9 +83,7 @@ public class MesCalTeamShiftServiceImpl implements MesCalTeamShiftService { buildRecordsForDay(allRecords, planId, currentDay, shiftIndex, plan.getShiftType(), teams, shifts); } - // 3. 先删除该计划的旧排班记录，再批量插入新记录 - // TODO @AI：能不能过有个 diff 的做法，insert、update、delete 这样？ - teamShiftMapper.deleteByPlanId(planId); + // 3. 批量插入排班记录 teamShiftMapper.insertBatch(allRecords); } -- libgit2 0.21.4