diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java index f24245f..0404e8e 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java @@ -2,6 +2,7 @@ package com.bonus.purchase.controller; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.purchase.domain.PurchaseDto; @@ -20,7 +21,7 @@ import java.util.List; * @create 2024/8/19 16:13 */ @RestController -@RequestMapping("/purchase/arrival") +@RequestMapping("/acceptance") public class PurchaseAcceptController extends BaseController { @Resource @@ -51,6 +52,30 @@ public class PurchaseAcceptController extends BaseController { return getDataTable(list); } + /** + * 单个或批量验收合格 + * @param purchaseDto + * @return + */ + @ApiOperation("单个或批量验收合格") + @PostMapping ("/approve") + public AjaxResult updateTask(PurchaseDto purchaseDto) + { + return purchaseAcceptService.updateTask(purchaseDto); + } + + /** + * 二级页面验收不合格 + * @param purchaseDto + * @return + */ + @ApiOperation("二级页面不合格") + @PostMapping ("/reject") + public AjaxResult updateDetails(PurchaseDto purchaseDto) + { + return purchaseAcceptService.updateDetails(purchaseDto); + } + /** * 导出新购验证列表 */ diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/PurchaseDto.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/PurchaseDto.java index a915cc7..69044a3 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/PurchaseDto.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/PurchaseDto.java @@ -3,7 +3,10 @@ package com.bonus.purchase.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** + * 新购模块查询传参类 * @Author ma_sh * @create 2024/8/19 17:50 */ @@ -29,8 +32,17 @@ public class PurchaseDto { private String keyWord; @ApiModelProperty(value = "状态") - private String status; + private Integer status; @ApiModelProperty(value = "出厂日期") private String productDate; + + @ApiModelProperty(value = "id集合") + private List taskIds; + + @ApiModelProperty(value = "任务id集合") + private String taskId; + + @ApiModelProperty(value = "二级明细id") + private String purchaseId; }