From 3a4ec5e2eae59901979f4309acb44eebacb75c56 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 25 八月 2023 17:45:18 +0800 Subject: [PATCH] 委托报检修改 --- standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java index 31b730b..79f34f0 100644 --- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java +++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java @@ -1,18 +1,11 @@ package com.yuanchu.limslaboratory.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.limslaboratory.service.ProductService; import com.yuanchu.limslaboratory.utils.MyUtil; import com.yuanchu.limslaboratory.vo.Result; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; /** * <p> @@ -30,20 +23,32 @@ @Autowired private ProductService productService; - @ApiOperation("鏌ヨ璇ュ瀷鍙蜂笅鐨勯」鐩�") + @ApiOperation("鏌ヨ璇ュ瀷鍙蜂笅鐨勯」鐩�-->閫夋嫨鐗堟湰") @ApiImplicitParams(value = { @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿ID", dataTypeClass = Integer.class, required = true) }) + @GetMapping("/chooseVersion") + public Result<?> chooseVersion(Integer specificationsId) { + return Result.success(productService.chooseVersion(specificationsId)); + } + + @ApiOperation("鏌ヨ璇ュ瀷鍙蜂笅鐨勯」鐩�") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿ID", dataTypeClass = Integer.class, required = true), + @ApiImplicitParam(name = "version", value = "鐗堟湰(榛樿鏈�鏂扮増鏈�)", dataTypeClass = Integer.class,required = true ) + }) @GetMapping("/page") - public Result<?> pageProductInformation(Integer specificationsId) { - return Result.success(productService.pageProductInformation(specificationsId)); + public Result<?> pageProductInformation(Integer specificationsId,Integer version) { + return Result.success(productService.pageProductInformation(specificationsId,version)); } @ApiOperation("濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨") @ApiImplicitParams(value = { @ApiImplicitParam(name = "id", value = "鏍囧噯椤圭洰ID", dataTypeClass = Integer.class, required = true), @ApiImplicitParam(name = "required", value = "鏍囧噯鍊�", dataTypeClass = String.class, required = true), + @ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true), @ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true) + }) @PostMapping("/write") public Result<?> write(Integer id, String required, String internal) { @@ -64,4 +69,14 @@ productService.deleteList(ids); return Result.success("鍒犻櫎鎴愬姛"); } + + @ApiOperation("娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true) + }) + @PostMapping("/addVersion") + public Result<?> addVersion(Integer specificationsId ) { + Integer version = productService.addVersion(specificationsId); + return Result.success("娣诲姞鐗堟湰"+version+"鎴愬姛"); + } } -- Gitblit v1.9.3