From 41fec4a47a841fe263cd25f9969ab26b21188233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B0=81=E7=BE=BD?= <2360164671@qq.com>
Date: Fri, 8 Jul 2022 13:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86Task=E7=9A=84?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA;=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=E7=9A=84=E6=96=87=E4=BB=B6=E6=91=98?=
 =?UTF-8?q?=E8=A6=81=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectmanagement/controller/StaffController.java     | 8 ++++++--
 .../cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java
index cef8b49..38622db 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java
@@ -8,6 +8,7 @@ import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -43,14 +44,17 @@ public class StaffController {
 
     @SneakyThrows
     @PostMapping(value = "/staff/import")
-    public ResponseMap upload(@RequestHeader("Token") String token, @RequestParam("uploadFile") MultipartFile uploadFile) {
+    public ResponseMap upload(@RequestHeader("Token") String token, @RequestParam("uploadFile") MultipartFile uploadFile,@RequestParam("digest") String digest) {
         if (null == uploadFile) {
-            throw new BadRequestException("空的文件参数");
+            throw new BadRequestException("文件传输错误");
         }
         String fileName = Objects.requireNonNull(uploadFile.getOriginalFilename()).toLowerCase();
         if (!fileName.endsWith(".xlsx")) {
             throw new BadRequestException("文件类型错误");
         }
+        if(!Objects.equals(DigestUtils.md5DigestAsHex(uploadFile.getBytes()).toLowerCase(),digest.toLowerCase())){
+            throw new BadRequestException("文件传输错误");
+        }
         Integer successCount = staffService.multiImport(token, uploadFile);
         return ResponseMap.ofSuccess("成功导入" + successCount + "条数据");
     }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java
index b2f731d..a745a5b 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java
@@ -100,6 +100,8 @@ public class Task {
             return false;
         if (father.getTaskId() == 0)
             return true;
+        if(!father.getTaskStatus().equals(STATUS_WAITING)&&!father.getTaskStatus().equals(STATUS_PROCESSING))
+            return false;
         if (this.getTaskType().equals(TYPE_DEFECT)) {
             return father.getTaskType().equals(TYPE_DEMAND);
         } else if (this.getTaskType().equals(TYPE_DEMAND)) {