From 8f666a68cfe34d11415b530bc9051f156cd4ef73 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 4 Aug 2023 15:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9B=91=E7=9D=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SystemUserServiceImpl.java        |  1 -
 .../modules/safety/entity/InspectQuestion.java     |  6 +++---
 .../impl/InspectQuestionExamineServiceImpl.java    | 14 ++++++--------
 .../service/impl/InspectRecordServiceImpl.java     |  5 +++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index d0feb2d..dd1a359 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -80,7 +80,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         } else {
             wrapper.eq("u.sn", systemUser.getSn());
         }
-        wrapper.ne("u.user_id", user.getUserId());
         return baseMapper.getPageList(wrapper);
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectQuestion.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectQuestion.java
index be0c7e0..4dde72d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectQuestion.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/InspectQuestion.java
@@ -77,9 +77,9 @@ public class InspectQuestion implements Serializable {
     private String createByName;
 
     /**
-     * 状态(1:待整改;2:已整改;3:已闭合;4:已驳回)
+     * 状态(1:待整改;2:待审核;3:已闭合;4:已驳回)
      */
-    @Excel(name = "状态(1:待整改;2:已整改;3:已闭合;4:已驳回)", width = 15)
-    @ApiModelProperty(value = "状态(1:待整改;2:已整改;3:已闭合;4:已驳回)")
+    @Excel(name = "状态(1:待整改;2:待审核;3:已闭合;4:已驳回)", width = 15)
+    @ApiModelProperty(value = "状态(1:待整改;2:待审核;3:已闭合;4:已驳回)")
     private Integer state;
 }
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 d694304..fb08405 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
@@ -65,14 +65,12 @@ public class InspectQuestionExamineServiceImpl extends ServiceImpl<InspectQuesti
         } else if (inspectQuestions.stream().filter(i -> i.getState() < 2).collect(Collectors.toList()).size() == 0) {
             state = 3;
         }
-        if (state != 2) {
-            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);
+        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 5ae684c..04730dd 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
@@ -164,6 +164,9 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
                 wrapper.eq(InspectQuestionExamine::getExamineState, 0);
                 inspectQuestionExamineService.update(wrapper);
             }
+            if (inspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4).collect(Collectors.toList()).size() != list.size()) {
+                return true;
+            }
             return this.updateById(inspectRecord);
         }
         return false;
@@ -225,8 +228,6 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
         inspectRecordVo.setCreateTime(new Date());
         inspectRecordVo.setCreateBy(user.getUserId());
         inspectRecordVo.setQuestionNum(inspectRecordVo.getInspectQuestionList().size());
-        String inspectUser = inspectRecordVo.getInspectUser();
-        inspectRecordVo.setInspectUser(StringUtils.isNotBlank(inspectUser) ? inspectUser + "," + user.getUserId() : user.getUserId());
         if (StringUtils.isNotBlank(inspectRecordVo.getEngineeringSn())) {
             String projectSn = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery().eq(Engineering::getEngineeringSn, inspectRecordVo.getEngineeringSn())).getProjectSn();
             inspectRecordVo.setProjectSn(projectSn);