From 32b77e7cb36b936fbbcb81b2861c17f650f38c05 Mon Sep 17 00:00:00 2001 From: lxw <810412026@qq.com> Date: 星期四, 21 十二月 2023 16:31:48 +0800 Subject: [PATCH] 修改物料推送接口 --- src/main/java/com/whyc/controller/SOPController.java | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/whyc/controller/SOPController.java b/src/main/java/com/whyc/controller/SOPController.java index 4ec6e76..57bf7f4 100644 --- a/src/main/java/com/whyc/controller/SOPController.java +++ b/src/main/java/com/whyc/controller/SOPController.java @@ -1,15 +1,11 @@ package com.whyc.controller; -import com.google.gson.reflect.TypeToken; import com.whyc.dto.Response; import com.whyc.dto.SopDto; import com.whyc.pojo.SOP; -import com.whyc.pojo.SOPProduct; -import com.whyc.pojo.Software; +import com.whyc.pojo.SOPLockLog; import com.whyc.service.SOPService; import com.whyc.util.ActionUtil; -import com.whyc.util.DateUtil; -import com.whyc.util.FileUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; @@ -19,8 +15,6 @@ import java.io.IOException; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; import java.util.List; @RequestMapping("sop") @@ -55,9 +49,15 @@ @ApiOperation("鏌ヨsop淇℃伅") @PostMapping("getSopInfo") public Response getSopInfo(@RequestBody(required = false) List<SopDto> list - , @RequestParam(required = false) String code, @RequestParam(required = false) String model + , @RequestParam(required = false) String code, @RequestParam(required = false) String model, @RequestParam(required = false) Integer status , @RequestParam int pageCurr, @RequestParam int pageSize) { - return service.getSopInfo(list,code,model,pageCurr,pageSize); + return service.getSopInfo(list,code,model,status,pageCurr,pageSize); + } + + @ApiOperation("鏌ヨsop鍘嗗彶") + @GetMapping("getSopHis") + public Response getSopHis(@RequestParam(required = false) String fileName) { + return service.getSopHis(fileName); } @ApiOperation("鏇存柊sop璇存槑锛堜笉鍚攣淇℃伅锛�") @@ -66,4 +66,10 @@ return service.updateSop(sop); } + @ApiOperation("璁剧疆sop鏈夋晥鐘舵��") + @PutMapping("updateStatusById") + public Response updateStatusById(@RequestBody SOPLockLog lockLog) { + return service.updateStatusById(lockLog); + } + } -- Gitblit v1.9.1