From d0da4caa5e22e45d3daa8f1bc7e80c1ca4951949 Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Fri, 16 Aug 2024 10:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ics/admin/controller/RepairAttachController.java    | 2 +-
 .../java/com/ics/admin/controller/RepairController.java     | 6 ++++--
 .../com/ics/admin/service/impl/RepairDeviceServiceImpl.java | 1 +
 .../main/java/com/ics/common/utils/file/MimeTypeUtils.java  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java
index f3e15e4..2588c1a 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairAttachController.java
@@ -65,7 +65,7 @@ public class RepairAttachController extends BaseController {
         if ((nodeId == 9 || nodeId == 13) && repairId == null) return R.error("无效参数");
         String ext = FileUploadUtils.getExtension(file);
         String type = IRepairAttachService.FILE_IMG;
-        if (StringUtils.isNotBlank(ext) && ext.toLowerCase().equals("mp4")) type = IRepairAttachService.FILE_VIDEO;
+        if (StringUtils.isNotBlank(ext) && ext.toLowerCase().equals("wav")) type = IRepairAttachService.FILE_VIDEO;
         return processAttache(file, repairId, nodeId, type);
     }
 
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
index 70c5e2d..699375d 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairController.java
@@ -50,7 +50,7 @@ public class RepairController extends BaseController {
     @PostMapping("flow/start")
     public R startFlow(@RequestBody RepairDTO repairDTO) {
         Long userId = getLoginStaffId();
-        if (!repairService.submitCheck(userId.toString())) return R.error("报修过于频繁,请稍后再试.");
+//        if (!repairService.submitCheck(userId.toString())) return R.error("报修过于频繁,请稍后再试.");
         String result = repairService.handleFlow(repairDTO.getRepair(), userId, repairDTO.getFiles(), null, null);
         return IRepairService.OK.equals(result) ? R.ok() : R.error(result);
     }
@@ -91,9 +91,11 @@ public class RepairController extends BaseController {
     public R list(@RequestBody Map<String, String> map) {
         String type = map.get("type");
         String menu = map.get("menu");
+        String workerId = map.get("workerId");
         if (StringUtils.isBlank(type) || StringUtils.isBlank(menu)) return R.error();
         startPage();
-        Long userId = getLoginStaffId();
+
+        Long userId = workerId!=null? Long.valueOf(workerId) :getLoginStaffId();
         return result(repairService.repairList(menu, userId.toString(), type));
     }
 
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java
index e0b0963..ca71427 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairDeviceServiceImpl.java
@@ -42,6 +42,7 @@ public class RepairDeviceServiceImpl extends ServiceImpl<RepairDeviceMapper, Rep
     @Override
     public List<RepairDevice> selectRepairDeviceList(RepairDevice repairDevice) {
         QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq(repairDevice.getTypeId() !=null, "type_id", repairDevice.getTypeId());
         return repairDeviceMapper.selectList(queryWrapper);
     }
 
diff --git a/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java b/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java
index 3ea6657..036a282 100644
--- a/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java
+++ b/shoot-hand/ics-common/ics-common-core/src/main/java/com/ics/common/utils/file/MimeTypeUtils.java
@@ -28,7 +28,7 @@ public class MimeTypeUtils {
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
-            "rar", "zip", "gz", "bz2","mp4","mp3",
+            "rar", "zip", "gz", "bz2","mp4","mp3","wav",
             // pdf
             "pdf"};