From b1ee044a6f0b6561fba149255432e0214c1884c3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 05 九月 2023 15:48:43 +0800
Subject: [PATCH] MOM系统-9-05 三个不合格完成
---
inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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..8bfd65b 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,11 @@
package com.yuanchu.mom.controller;
-
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.dto.ConsignmentDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -13,10 +16,14 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.ConsignmentService;
import javax.annotation.Resource;
+import java.sql.Wrapper;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -44,16 +51,36 @@
@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));
}
@ApiOperation(value = "鏂板鎴愬搧鍙戣揣")
@PostMapping("/addCon")
- public Result addCon(@RequestHeader("token") String token, @RequestBody ConsignmentDto consignmentDto) throws Exception {
+ public Result addCon(@RequestHeader("token") String token, @Validated @RequestBody ConsignmentDto consignmentDto) throws Exception {
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
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);
+ }
+
+
+
}
--
Gitblit v1.9.3