From 39dcc19104373d139a0040f3d2e98ddc412900ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C18231669351=E2=80=9D?= <“1686821393@qq.com”>
Date: Sat, 25 Mar 2023 17:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=A2=9E=E5=8A=A0=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=EF=BC=882023.3.25?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ncst/carbon/controller/task/TaskAuditController.java | 9 ---------
 .../main/java/edu/ncst/carbon/model/task/TaskAudit.java  | 3 +++
 .../java/edu/ncst/carbon/service/ITaskAuditService.java  | 1 -
 .../carbon/service/impl/task/TaskAuditServiceImpl.java   | 1 +
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java
index eb8ada5..3aa1a5d 100644
--- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java
+++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/controller/task/TaskAuditController.java
@@ -130,13 +130,4 @@ public class TaskAuditController {
         return ResultUtils.success("ok", result);
     }
 
-    @ApiOperation("用户确认审核任务")
-    @PostMapping("/confirm")
-    public ResultVO<TaskAudit> confirmAudit( @RequestParam Integer taskAuditId) {
-
-        TaskAudit result = taskAuditService.confirmAudit(taskAuditId);
-
-        return ResultUtils.success("ok", result);
-    }
-
 }
diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java
index a522dde..68200d0 100644
--- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java
+++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/model/task/TaskAudit.java
@@ -53,5 +53,8 @@ public class TaskAudit implements Serializable {
     @ApiModelProperty(value = "审批状态：待审核 1 审核通过 2 审核未通过 3 完成 0")
     private String status;
 
+    @ApiModelProperty(value = "任务类型")
+    private String taskName;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java
index 4358f5a..ff6d0f2 100644
--- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java
+++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/ITaskAuditService.java
@@ -28,5 +28,4 @@ public interface ITaskAuditService extends IService<TaskAudit>{
 
     TaskAudit audit(Integer taskAuditId,  Boolean yesNo);
 
-    TaskAudit confirmAudit(Integer taskAuditId);
 }
diff --git a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java
index 4e2fad1..b828369 100644
--- a/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java
+++ b/CarbonSysBE1/src/main/java/edu/ncst/carbon/service/impl/task/TaskAuditServiceImpl.java
@@ -193,6 +193,7 @@ public class TaskAuditServiceImpl extends ServiceImpl<TaskAuditMapper, TaskAudit
             taskAudit.setText(text);
             taskAudit.setStatus("1");
             taskAudit.setIntegral(integral);
+            taskAudit.setTaskName(task.getName());
 
             CarFormula carFormula = carbonFormulaMapper.selectById(task.getCarbonFormulaId());
             taskAudit.setEmission(integral*carFormula.getEmission());