diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceScheduleController.java b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceScheduleController.java index ce3239bc..1bb542c8 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsAttendanceScheduleController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsAttendanceScheduleController.java @@ -94,10 +94,10 @@ public class WmsAttendanceScheduleController extends BaseController { * @param scheduleIds 主键串 */ @Log(title = "排班(谁在哪天上班)", businessType = BusinessType.DELETE) - @DeleteMapping("/{scheduleIds}") + @DeleteMapping("/remove") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] scheduleIds) { - return toAjax(iWmsAttendanceScheduleService.deleteWithValidByIds(Arrays.asList(scheduleIds), true)); + @RequestBody String scheduleIds) { + return toAjax(iWmsAttendanceScheduleService.deleteWithValidByIds(scheduleIds, true)); } /** diff --git a/klp-wms/src/main/java/com/klp/service/IWmsAttendanceScheduleService.java b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceScheduleService.java index 4fe63d6e..8f34387d 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsAttendanceScheduleService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsAttendanceScheduleService.java @@ -48,7 +48,7 @@ public interface IWmsAttendanceScheduleService { /** * 校验并批量删除排班(谁在哪天上班)信息 */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + Boolean deleteWithValidByIds(String ids, Boolean isValid); /** * 生成排班 diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java index a87e3cd9..2afbc13e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceScheduleServiceImpl.java @@ -148,11 +148,22 @@ public class WmsAttendanceScheduleServiceImpl implements IWmsAttendanceScheduleS * 批量删除排班(谁在哪天上班) */ @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + public Boolean deleteWithValidByIds(String ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } - return baseMapper.deleteBatchIds(ids) > 0; + // 将逗号分隔的字符串转换为Long列表 + List idList = Arrays.stream(ids.split(",")) + .map(String::trim) + .filter(StringUtils::isNotBlank) + .map(Long::parseLong) + .collect(Collectors.toList()); + + if (idList.isEmpty()) { + return false; + } + + return baseMapper.deleteBatchIds(idList) > 0; } /**