From 06c2cf095cbaf28fbec006f79c943fb1129cbcea Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 19 Feb 2024 10:13:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9=E5=88=86?=
 =?UTF-8?q?=E6=9E=90-=E7=BB=88=E7=AB=AF=E6=A3=80=E6=B5=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/process/pojo/dto/excel/TerminalExcel.java     | 7 -------
 .../process/mapper/mapping/PmsTerminalDetectionMapper.xml  | 2 +-
 .../service/impl/PmsTerminalDetectionServiceImpl.java      | 4 ++--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/excel/TerminalExcel.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/excel/TerminalExcel.java
index 88cf49ba3..4a49b7229 100644
--- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/excel/TerminalExcel.java
+++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/excel/TerminalExcel.java
@@ -1,14 +1,8 @@
 package com.njcn.process.pojo.dto.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.device.pq.pojo.constant.DeviceValidMessage;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -33,7 +27,6 @@ public class TerminalExcel implements Serializable {
 
     @Excel(name = "终端名称",width = 15)
     @NotBlank(message = "终端名称不为空")
-    @Pattern(regexp = PatternRegex.DEPT_NAME_REGEX, message = DeviceValidMessage.PROJECT_NAME_RULE)
     private String name;
 
     @Excel(name = "组织机构名称",width = 15)
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/PmsTerminalDetectionMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/PmsTerminalDetectionMapper.xml
index d10d36ba1..bc6d4270c 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/PmsTerminalDetectionMapper.xml
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/PmsTerminalDetectionMapper.xml
@@ -90,7 +90,7 @@
             </if>
         </where>
         GROUP BY
-        Create_Time
+            statisticsDate
     </select>
     <select id="selectResultsCycleStatistics" resultType="com.njcn.process.pojo.vo.TerminalVO$ResultsStatistics">
         SELECT
diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
index a077311f8..3a9fe67d6 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
@@ -136,7 +136,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
 
         LocalDate inspectionTime = param.getInspectionTime();
         detection.setNextInspectionTime(inspectionTime.plusYears(5));
-        detection.setTestResults(0);
+        detection.setTestResults(StrUtil.isNotBlank(param.getOriginalReport())?1:0);
         detection.setStatus(1);
         return this.save(detection);
     }
@@ -414,7 +414,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
                 addMsg(terminalExcelMsg, terminalExcel, msg, "当前终端编号重复");
                 continue;
             }
-            String orgName = terminalExcel.getOrgName();
+            String orgName = terminalExcel.getOrgName().trim();
             //判断
             List<PvTerminalTreeVO> deptList = data.stream().filter(d ->
                     d.getName().indexOf(orgName) > -1