From 4422564b84dae692a44e955d7d696b39dbf3c155 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 01 四月 2025 09:59:44 +0800 Subject: [PATCH] #新增 1. 添加质检明细批量修改接口 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 2 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 33 ++++++++++++++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java | 18 +++++++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java | 4 ++ rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java | 29 ++++++++++++++ 5 files changed, 85 insertions(+), 1 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java index 029d41c..1ec099d 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyIsptItemController.java @@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.controller.params.IsptItemsParams; +import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.entity.QlyIsptItem; import com.vincent.rsf.server.manager.service.QlyIsptItemService; import com.vincent.rsf.server.system.controller.BaseController; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -107,4 +111,18 @@ ExcelUtil.build(ExcelUtil.create(qlyIsptItemService.list(), QlyIsptItem.class), response); } + @PreAuthorize("hasAuthority('manager:qlyIsptItem:update')") + @ApiOperation("鎵归噺淇敼") + @PostMapping("/qlyIsptItem/batch/update") + public R batchUpdate(@RequestBody IsptItemsParams params) { + if (Objects.isNull(params)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + if (qlyIsptItemService.batchUpdate(params)) { + return R.ok("淇敼鎴愬姛锛侊紒"); + } else { + return R.error("淇敼澶辫触锛侊紒"); + } + } + } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java new file mode 100644 index 0000000..37b0fdc --- /dev/null +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/IsptItemsParams.java @@ -0,0 +1,29 @@ +package com.vincent.rsf.server.manager.controller.params; + +import com.vincent.rsf.server.manager.entity.QlyIsptItem; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Ryan + * @version 1.0 + * @title IsptItemsParams + * @description + * @create 2025/4/1 09:41 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "IsptItemsParams", description = "鏄庣粏淇敼鍙傛暟") +public class IsptItemsParams implements Serializable { + + @ApiModelProperty("涓诲崟ID") + private List<Long> ids; + + @ApiModelProperty("鏄庣粏鍙傛暟") + private QlyIsptItem isptItem; +} diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java index 43cb684..16fbb26 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyIsptItemService.java @@ -1,8 +1,12 @@ package com.vincent.rsf.server.manager.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.server.manager.controller.params.IsptItemsParams; +import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.entity.QlyIsptItem; public interface QlyIsptItemService extends IService<QlyIsptItem> { + boolean batchUpdate(IsptItemsParams params); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java index f973218..f8bcbe2 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java @@ -1,12 +1,45 @@ package com.vincent.rsf.server.manager.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.manager.controller.params.IsptItemsParams; +import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper; import com.vincent.rsf.server.manager.entity.QlyIsptItem; import com.vincent.rsf.server.manager.service.QlyIsptItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Objects; + @Service("qlyIsptItemService") public class QlyIsptItemServiceImpl extends ServiceImpl<QlyIsptItemMapper, QlyIsptItem> implements QlyIsptItemService { + /** + * @author Ryan + * @description 鎵归噺淇敼 + * @param + * @return + * @time 2025/4/1 09:40 + */ + @Override + public boolean batchUpdate(IsptItemsParams params) { + if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) { + throw new CoolException("ID涓嶈兘涓虹┖锛侊紒"); + } + QlyIsptItem isptItem = params.getIsptItem(); + if (Objects.isNull(isptItem)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛�"); + } + + return this.update(new LambdaUpdateWrapper<QlyIsptItem>() + .in(QlyIsptItem::getId, params.getIds()) + .set(!Objects.isNull(isptItem.getIsptStatus()), QlyIsptItem::getIsptStatus, !Objects.isNull(isptItem.getIsptStatus()) ? isptItem.getIsptStatus() : "0") + .set(!Objects.isNull(isptItem.getDisQty()), QlyIsptItem::getDisQty, !Objects.isNull(isptItem.getDisQty()) ? isptItem.getDisQty() : 0) + .set(!Objects.isNull(isptItem.getDlyQty()), QlyIsptItem::getDlyQty, !Objects.isNull(isptItem.getDlyQty()) ? isptItem.getDlyQty() : 0) + .set(!Objects.isNull(isptItem.getIsptResult()), QlyIsptItem::getIsptResult, !Objects.isNull(isptItem.getIsptResult()) ? isptItem.getIsptResult() : "0")); + } } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java index 59b033c..3940127 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java @@ -56,7 +56,7 @@ throw new CoolException("缁勬嫋淇℃伅涓嶅瓨鍦紒锛�"); } /**鑾峰彇缁勬嫋鏄庣粏**/ - List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, ids)); + List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, ids)); if (waitPakinItems.isEmpty()) { throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪"); } -- Gitblit v1.9.1