From c0791ca2b2b50d89a8020fbcf116adcde2e65730 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 21 Jul 2023 14:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E6=89=A7=E6=B3=95=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/modules/safety/entity/InspectRecord.java  | 6 ++++++
 .../service/impl/InspectQuestionExamineServiceImpl.java     | 4 ++++
 .../safety/service/impl/InspectRecordServiceImpl.java       | 1 +
 src/main/java/com/zhgd/xmgl/util/ParamEnum.java             | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectRecord.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectRecord.java
index 417567b..f85bbdf 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectRecord.java
@@ -106,6 +106,12 @@ public class InspectRecord implements Serializable {
     @Excel(name = "创建人", width = 20)
     @ApiModelProperty(value = "创建人")
     private String createBy;
+    /**
+     * 闭合时间
+     */
+    @Excel(name = "闭合时间", width = 15)
+    @ApiModelProperty(value = "闭合时间")
+    private Date solveTime;
     /**
      * 整改问题数
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java
index 82b9dcd..bae2e91 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java
@@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.safety.service.IInspectRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,6 +51,9 @@ public class InspectQuestionExamineServiceImpl extends ServiceImpl<InspectQuesti
         if (state != 3) {
             LambdaUpdateWrapper<InspectRecord> recordWrapper = Wrappers.<InspectRecord>lambdaUpdate();
             recordWrapper.set(InspectRecord::getState, state);
+            if (state == 4) {
+                recordWrapper.set(InspectRecord::getSolveTime, new Date());
+            }
             recordWrapper.eq(InspectRecord::getId, inspectQuestion.getRecordId());
             inspectRecordService.update(recordWrapper);
         }
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
index f072434..5da30f7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
@@ -144,6 +144,7 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
             questionState = 3;
             questionExamineState = 1;
             suggest = "同意";
+            inspectRecord.setSolveTime(new Date());
         }
         // 修改问题状态
         LambdaUpdateWrapper<InspectQuestion> wrapperQuestion = Wrappers.<InspectQuestion>lambdaUpdate();
diff --git a/src/main/java/com/zhgd/xmgl/util/ParamEnum.java b/src/main/java/com/zhgd/xmgl/util/ParamEnum.java
index a6ffc54..ea9d45f 100644
--- a/src/main/java/com/zhgd/xmgl/util/ParamEnum.java
+++ b/src/main/java/com/zhgd/xmgl/util/ParamEnum.java
@@ -67,7 +67,7 @@ public class ParamEnum {
     }
 
     /**
-     *  附件类型枚举
+     *  扬尘信息枚举
      */
     public enum EnvironmentAlarmTypeThreshold {
         PM10(1, "PM10"),