监督执法整改优化

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;
     /**
      * 整改问题数
      */

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);
         }

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();

src/main/java/com/zhgd/xmgl/util/ParamEnum.java

@@ -67,7 +67,7 @@ public class ParamEnum {
     }
 
     /**
-     *  附件类型枚举
+     *  扬尘信息枚举
      */
     public enum EnvironmentAlarmTypeThreshold {
         PM10(1, "PM10"),