From 6d843a1532f84dd728d2871630e764d513ad2662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 25 Aug 2023 00:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OtaManageApplyEOServiceImpl.java    | 12 ++++++++----
 .../project/mapper/ProjectLibraryBaseMapper.java     |  4 ++++
 .../project/mapper/xml/ProjectLibraryBaseMapper.xml  | 10 ++++++++++
 .../project/service/IProjectLibraryBaseService.java  |  2 ++
 .../service/impl/ProjectLibraryBaseServiceImpl.java  |  9 +++++++++
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 1d5a7c11e..1f0294c94 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -1098,7 +1098,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         List<String> idList = list.stream()
                 .filter(e -> StringUtils.isNotBlank(e.getProjectVersion()))
                 .map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList());
-        List<ProjectLibraryBase> proList = projectLibraryBaseService.queryList(idList);
+        List<ProjectLibraryBase> proList = projectLibraryBaseService.getListByIds(idList);
         for (ProjectLibraryBase plb : proList) {
             res.put(plb.getId(), plb.getShowName());
         }
@@ -1173,15 +1173,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                         conSb.append(user.getUsername()).append(" : ");
                         conSbEn.append(user.getUsername()).append(" : ");
                         if (StringUtils.isNotEmpty(oma.getProjectVersion())) {
-                            conSb.append("‘项目版本‘ 由 ‘空‘").append(" 改为 ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘.");
+                            conSb.append("‘项目版本‘ 由 ‘null‘").append(" 改为 ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘.");
                             conSbEn.append("‘Project Version‘ change from ‘null‘").append(" to ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘.");
                         }
                         if (StringUtils.isNotEmpty(oma.getAttestationSchedule())) {
-                            conSb.append("‘认证进度‘ 由 ‘空‘").append(" 改为 ‘").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()).append("‘.");
+                            conSb.append("‘认证进度‘ 由 ‘null‘").append(" 改为 ‘").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()).append("‘.");
                             conSbEn.append("‘Homologation Progress‘ change from ‘null‘").append(" to ‘").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getValue()).append("‘.");
                         }
                         if (StringUtils.isNotEmpty(oma.getRemark()) && !oma.getRemark().equals("--")) {
-                            conSb.append("‘备注‘ 由 ‘空‘").append(" 改为 ‘").append(oma.getRemark()).append("‘.");
+                            conSb.append("‘备注‘ 由 ‘null‘").append(" 改为 ‘").append(oma.getRemark()).append("‘.");
                             conSbEn.append("‘Remark‘ change from ‘null‘").append(" to ‘").append(oma.getRemark()).append("‘.");
                         }
                         his.setContentCn(conSb.toString());
@@ -1191,6 +1191,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 }
             }
             if (saveList.size() > 0) {
+                List<String> delList = saveList.stream()
+                        .filter(e -> StringUtils.isNotBlank(e.getId()))
+                        .map(OtaManageApplyEO::getId).distinct().collect(Collectors.toList());
+                this.deleteByIds(delList);
                 this.saveOrUpdateBatch(saveList);
                 otaManageHistoryService.saveBatch(hisList);
             }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
index bf11fb26c..177df9c1b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java
@@ -26,4 +26,8 @@ public interface ProjectLibraryBaseMapper extends BaseMapper<ProjectLibraryBase>
     List<ProjectLibraryBase> queryById(String id);
 
     ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId);
+
+    List<ProjectLibraryBase> getListByIds(@Param("idList") List<String> idList);
+
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 72c19665d..0a9425628 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -290,4 +290,14 @@
         WHERE
             plb.id = #{projectLibraryId}
     </select>
+
+    <select id="getListByIds" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
+
+        <include refid="select_item"/>
+        where plb.id in
+        <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        order by plb.create_time desc
+    </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
index 679177683..887732bec 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java
@@ -186,4 +186,6 @@ public interface IProjectLibraryBaseService extends IService<ProjectLibraryBase>
     Result<?> overallReplacementUser(JSONObject json);
 
 	List<ProjectLibraryBase> queryList(List<String> projectIdList);
+
+	List<ProjectLibraryBase> getListByIds(List<String> projectIdList);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index d4334bbe5..c479e138b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -3525,6 +3525,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		List<ProjectLibraryBase> res = this.list(queryWrapper);
 		return res;
 	}
+
+	@Override
+	public List<ProjectLibraryBase> getListByIds(List<String> projectIdList) {
+		List<ProjectLibraryBase> res = new ArrayList<>();
+		if(CollectionUtils.isNotEmpty(projectIdList)){
+			res = this.getBaseMapper().getListByIds(projectIdList);
+		}
+		return res;
+	}
 }