From e78392efdcaadd1883c922f669e025ec0dbe2111 Mon Sep 17 00:00:00 2001
From: liuchengqian <liuchengqian666@gmail.com>
Date: Fri, 11 Mar 2022 16:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xkrs/newpro/controller/QcItemController.java | 2 +-
 .../java/com/xkrs/newpro/controller/QcSourceController.java    | 2 +-
 src/main/java/com/xkrs/newpro/controller/QcSpecController.java | 2 +-
 src/main/java/com/xkrs/util/ExcelUploadUtil.java               | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xkrs/newpro/controller/QcItemController.java b/src/main/java/com/xkrs/newpro/controller/QcItemController.java
index 14a03c6..3ac1d8e 100644
--- a/src/main/java/com/xkrs/newpro/controller/QcItemController.java
+++ b/src/main/java/com/xkrs/newpro/controller/QcItemController.java
@@ -45,7 +45,7 @@ public class QcItemController {
      * 查询检验项目
      */
     @GetMapping("/queryQcItem")
-    public String queryQcItem(@RequestParam(value = "no") String no, @RequestParam(value = "name") String name) {
+    public String queryQcItem(@RequestParam(required = false, value = "no") String no, @RequestParam(required = false, value = "name") String name) {
         return qcItemService.queryQcItem(no, name);
     }
 
diff --git a/src/main/java/com/xkrs/newpro/controller/QcSourceController.java b/src/main/java/com/xkrs/newpro/controller/QcSourceController.java
index b6f28c5..8259498 100644
--- a/src/main/java/com/xkrs/newpro/controller/QcSourceController.java
+++ b/src/main/java/com/xkrs/newpro/controller/QcSourceController.java
@@ -36,7 +36,7 @@ public class QcSourceController {
      * 查询检验数据
      */
     @GetMapping("/queryQcSource")
-    public String queryQcSource(@RequestParam(value = "batchNo") String batchNo, @RequestParam(value = "machineNo") String machineNo, @RequestParam(value = "materialNo") String materialNo, @RequestParam(value = "mouldNo") String mouldNo, @RequestParam(value = "varietyNo") String varietyNo) {
+    public String queryQcSource(@RequestParam(required = false, value = "batchNo") String batchNo, @RequestParam(required = false, value = "machineNo") String machineNo, @RequestParam(required = false, value = "materialNo") String materialNo, @RequestParam(required = false, value = "mouldNo") String mouldNo, @RequestParam(required = false, value = "varietyNo") String varietyNo) {
         return qcSourceService.queryQcSource(batchNo, machineNo, materialNo, mouldNo, varietyNo);
     }
 
diff --git a/src/main/java/com/xkrs/newpro/controller/QcSpecController.java b/src/main/java/com/xkrs/newpro/controller/QcSpecController.java
index 4ac5733..7c03b5f 100644
--- a/src/main/java/com/xkrs/newpro/controller/QcSpecController.java
+++ b/src/main/java/com/xkrs/newpro/controller/QcSpecController.java
@@ -45,7 +45,7 @@ public class QcSpecController {
      * 查询检验规格
      */
     @GetMapping("/queryQcSpec")
-    public String queryQcSpec(@RequestParam(value = "varietyNo") String varietyNo, @RequestParam(value = "qcItemNo") String qcItemNo) {
+    public String queryQcSpec(@RequestParam(required = false, value = "varietyNo") String varietyNo, @RequestParam(required = false, value = "qcItemNo") String qcItemNo) {
         return qcSpecService.queryQcSpec(varietyNo, qcItemNo);
     }
 
diff --git a/src/main/java/com/xkrs/util/ExcelUploadUtil.java b/src/main/java/com/xkrs/util/ExcelUploadUtil.java
index 0c542cf..90ef579 100644
--- a/src/main/java/com/xkrs/util/ExcelUploadUtil.java
+++ b/src/main/java/com/xkrs/util/ExcelUploadUtil.java
@@ -49,7 +49,7 @@ public class ExcelUploadUtil {
             //实现上传
             fileInput.transferTo(new File(path));
 //            return path;
-            return "http://118.24.27.47:2088/" + subDir + newName;
+            return subDir + newName;
         }
         return null;
     }
@@ -95,7 +95,6 @@ public class ExcelUploadUtil {
         return fireTaskPhotos;
     }*/
 
-
     /**
      * 删除本地或服务器储存的图片
      */