diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java index 79e36281..42870b59 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java @@ -81,7 +81,7 @@ public class MoldDemandController extends BladeController { @PostMapping("/closeBatch") @Operation(summary = "批量关闭", description = "传入ids") public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - Boolean result = moldDemandService.changeStatus(Func.toLongList(ids), MoldDemandEnum.STATUS_CLOSE.getCode()); + Boolean result = moldDemandService.closeBatch(Func.toLongList(ids)); return R.status(result); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java index d8b8e941..77d3acc8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java @@ -40,4 +40,11 @@ public interface IMoldDemandService extends BaseService { MoldDemandVo detail(String id); + + /** + * 批量关闭 + * @param toLongList + * @return + */ + Boolean closeBatch(List toLongList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java index 6fff3cd2..99d45b06 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java @@ -1,9 +1,11 @@ package org.springblade.desk.order.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; @@ -139,4 +141,28 @@ public class MoldDemandServiceImpl extends BaseServiceImpl idList) { + // 1. 参数校验 + if (CollectionUtils.isEmpty(idList)) { + throw new ServiceException("要关闭的模具需求ID列表不能为空"); + } + + // 2. 查询数据 + List moldDemandList = baseMapper.selectByIds(idList); + if (CollectionUtils.isEmpty(moldDemandList)) { + throw new ServiceException("未找到对应的模具需求数据"); + } + + // 4. 设置状态(根据业务需求选择正确的状态) + for (MoldDemand moldDemand : moldDemandList) { + // 只处理未关闭的 + if (!moldDemand.getMafStatus().equals(MoldDemandEnum.STATUS_CLOSE.getCode())) { + moldDemand.setMafStatus(MoldDemandEnum.STATUS_CLOSE.getCode()); + } + } + // 5. 批量更新 + return this.updateBatchById(moldDemandList); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java index dd3accb5..f9e15406 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsRecordServiceImpl.java @@ -236,10 +236,12 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl