✨ feat(mes): 移除冗余的班组类型枚举引用及相关注释

YunaiV
1 parent 478bf399
Showing 5 changed files with 3 additions and 51 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/plan/MesCalPlanDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/team/MesCalTeamDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/team/MesCalTeamShiftMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/cal/MesCalCalendarTypeEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java
 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;
     /**
 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;
     /**
@@ -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&lt;MesCalTeamShiftDO&gt; {
                 .orderByAsc(MesCalTeamShiftDO::getSort));
     }
  
-    default MesCalTeamShiftDO selectByDayAndTeamId(LocalDateTime day, Long teamId) {
-        return selectOne(new LambdaQueryWrapperX<MesCalTeamShiftDO>()
-                .eq(MesCalTeamShiftDO::getDay, day)
-                .eq(MesCalTeamShiftDO::getTeamId, teamId));
+    default List<MesCalTeamShiftDO> selectListByPlanId(Long planId) {
+        return selectList(MesCalTeamShiftDO::getPlanId, planId);
     }
  
     default void deleteByPlanId(Long planId) {
-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<Integer> {
-
-    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;
-    }
-
-}
@@ -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);
     }