From 56f89b4a45a561ff017ffd1e611e542130d046a0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:19 +0800
Subject: [PATCH] 合并
---
inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
index ef0cd6b..3e80933 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
@@ -1,8 +1,8 @@
package com.yuanchu.mom.controller;
-
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.dto.ConsignmentDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -17,6 +17,8 @@
import com.yuanchu.mom.service.ConsignmentService;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -44,7 +46,7 @@
@ApiImplicitParam(name = "orderNumber", value = "璁㈠崟缂栧彿", dataTypeClass = String.class, required = true)
})
@GetMapping("/selSale")
- public Result selSale(String orderNumber ) {
+ public Result selSale(String orderNumber) {
return Result.success(saleService.selSale(orderNumber));
}
@@ -55,5 +57,42 @@
return Result.success(consignmentService.addCon(data.get("name").replaceAll("\"", ""), consignmentDto));
}
+
+ @ApiOperation(value = "鏌ヨ鍙戣揣璁板綍鍒楄〃")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "specifications", value = "浜у搧鍨嬪彿", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "time", value = "鍙戣揣鏃ユ湡", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectAllCon")
+ public Result selectAllCon(int pageSize, int countSize, String name, String specifications, String time) {
+ IPage<Map<String, Object>> consignmentPage = consignmentService.selectAllCon(new Page<Object>(pageSize, countSize), name, specifications, time);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", consignmentPage.getTotal());
+ map.put("row", consignmentPage.getRecords());
+ return Result.success(map);
+ }
+ @ApiOperation(value = "鏍规嵁鍙戣揣id鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鍙戣揣id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delCon")
+ public Result delCon(Integer id) {
+ consignmentService.delCon(id);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鎵归噺鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "ids", value = "ids", dataTypeClass = Integer.class, dataType = "List", required = true)
+ })
+ @PostMapping("/delAllCon")
+ public Result delAllCon(@RequestParam("ids") List<Integer> ids) {
+ consignmentService.delAllCon(ids);
+ return Result.success();
+ }
+
}
--
Gitblit v1.9.3