From 3c3a0e8f593d12e05fcc09cfdb2d90ef8cc4b491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 16 Apr 2023 15:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/service/impl/OtaBaSjListServiceImpl.java  | 8 ++++----
 .../ota/service/impl/OtaBaSjSjfzbhServiceImpl.java        | 4 ++--
 .../ota/service/impl/OtaBaSjSjmbclServiceImpl.java        | 4 ++--
 .../ota/service/impl/OtaBaSjSjxtbhServiceImpl.java        | 4 ++--
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 5 ++++-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
index c6eb79457..eed1392ca 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
@@ -200,8 +200,8 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
         File sjmbcxFile = ImportFileUtil.findFile(exportFile, "升级目标车型.xlsx");
         otaBaSjSjmbcxService.exportData(sjmbcxFile, otaId, cut);
 
-        File mbclFile = ImportFileUtil.findFile(exportFile, "本次升级涉及的目标车辆.xlsx");
-        File mbclAttFile = ImportFileUtil.findFoder(exportFile, "本次升级涉及的目标车辆");
+        File mbclFile = ImportFileUtil.findFile(exportFile, "本次升级的目标车辆.xlsx");
+        File mbclAttFile = ImportFileUtil.findFoder(exportFile, "本次升级的目标车辆");
         otaBaSjSjmbclService.exportData(mbclFile, mbclAttFile, otaId, cut);
 
 
@@ -211,10 +211,10 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
         File pgAtt2File = ImportFileUtil.findFoder(pgAttFile, "硬件版本号附件");
         otaBaSjSjyxpgService.exportData(pgFile, pgAtt1File, pgAtt2File, otaId, cut);
 
-        File sjSjxtbhFile = ImportFileUtil.findFile(exportFile, "本次升级的系统名称与变更参数.xlsx");
+        File sjSjxtbhFile = ImportFileUtil.findFile(exportFile, "本次升级的系统名称与参数变化.xlsx");
         otaBaSjSjxtbhService.exportData(sjSjxtbhFile, otaId, cut);
 
-        File sjfzbhFile = ImportFileUtil.findFile(exportFile, "本次升级的驾驶辅助功能与参数变化.xlsx");
+        File sjfzbhFile = ImportFileUtil.findFile(exportFile, "本次升级的驾驶辅助功能名称与参数变化.xlsx");
         otaBaSjSjfzbhService.exportData(sjfzbhFile, otaId, cut);
 
         File fsFile = ImportFileUtil.findFile(exportFile, "用户告知内容及方式.xlsx");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
index 843ac0d9e..0f88198d6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java
@@ -216,7 +216,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
 
     @Override
     public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
-        ImportFileUtil.exportTemplate(response, templatePath + "本次升级的驾驶辅助功能与参数变化.zip");
+        ImportFileUtil.exportTemplate(response, templatePath + "本次升级的驾驶辅助功能名称与参数变化.zip");
     }
 
     @Override
@@ -229,7 +229,7 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl<OtaBaSjSjfzbhMapper, O
     public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception {
         File upFile = null;
         for (File f : upLoadFiles) {
-            if (f.getName().equals("本次升级的驾驶辅助功能与参数变化.xlsx")) {
+            if (f.getName().equals("本次升级的驾驶辅助功能名称与参数变化.xlsx")) {
                 upFile = f;
             }
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
index c9023e723..22d14668c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
@@ -177,14 +177,14 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
 
     @Override
     public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
-        ImportFileUtil.exportTemplate(response, templatePath + "本次升级涉及的目标车辆.zip");
+        ImportFileUtil.exportTemplate(response, templatePath + "本次升级的目标车辆.zip");
     }
 
     @Override
     public OtaBaSjSjmbcl parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception {
         File upFile = null;
         for (File f : upLoadFiles) {
-            if (f.getName().equals("本次升级涉及的目标车辆.xlsx")) {
+            if (f.getName().equals("本次升级的目标车辆.xlsx")) {
                 upFile = f;
             }
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
index b9941ab85..54a126f67 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java
@@ -197,7 +197,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
 
     @Override
     public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
-        ImportFileUtil.exportTemplate(response, templatePath + "本次升级的系统名称与变更参数.zip");
+        ImportFileUtil.exportTemplate(response, templatePath + "本次升级的系统名称与参数变化.zip");
     }
 
     @Override
@@ -210,7 +210,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl<OtaBaSjSjxtbhMapper, O
     public void parseFileList(List<File> upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception {
         File upFile = null;
         for (File f : upLoadFiles) {
-            if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) {
+            if (f.getName().equals("本次升级的系统名称与参数变化.xlsx")) {
                 upFile = f;
             }
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 22bee1dfe..f2cb2733b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -11343,7 +11343,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
 			//未发起或拒绝 可以发起清单确认
 			boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
-					||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()));
+					||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
+					||StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+					||StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
+			);
 			//如果该数据的法规工程师不为空
 			boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()));
 			if(checkStatus && checkUser){