From be2aab51995790db7b6c4de48e9f0429bb6ad09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 22 Aug 2023 11:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/ota/enums/OtaStatusEnum.java |  2 +-
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml |  3 +--
 .../impl/OtaManageApplyEOServiceImpl.java     | 26 ++++++++++++++++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaStatusEnum.java
index 6322ce702..3bff8c564 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaStatusEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaStatusEnum.java
@@ -11,7 +11,7 @@ public enum OtaStatusEnum {
     LOCKED("locked", "锁定","Locked"),
     REJECTED("rejected", "退回","Rejected"),
     TO_BE_REMATCHED("to_be_rematched", "待重新匹配","To be rematched"),
-    NA("-", "-","-");
+    NA("--", "--","--");
 
     String key;
     String nameCN;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index a4ed5c8e8..550019bc0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -19,12 +19,11 @@
         select * from ota_manage_apply
         JOIN ota_manage_receive ON ota_manage_apply.vdr = ota_manage_receive.id
         <where>
-            ota_manage_apply =#{projectId}
+            ota_manage_apply.project_version =#{projectId}
             <if test="plannedBpLaunchBatch != null and plannedBpLaunchBatch != ''">
                 and ota_manage_receive.planned_bp_launch_batch_ =#{plannedBpLaunchBatch}
             </if>
         </where>
-        order by create_time desc
     </select>
 
     <select id="getOtaList" resultType="com.jero.modules.ota.entity.OtaManageApplyEO">
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 878544786..dc064bfc0 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
@@ -950,7 +950,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 			List<OtaManageApplyEO> omaList = this.getListByIds(idList);
 			for (OtaManageApplyEO oma : omaList) {
 				if (oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey())) {
-					oma.setMatchStatus(OtaStatusEnum.TO_BE_REMATCHED.getKey());
+					oma.setMatchStatus(OtaStatusEnum.TO_BE_APPROVED.getKey());
 					oma.setProjectVersion(projectVersion);
 					otaManageHistoryService.add(oma.getId(),user.getUsername() + " 重新匹配了数据！");
 				} else {
@@ -994,7 +994,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 			for (OtaManageApplyEO oma : omaList) {
 				if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) {
 					oma.setMatchStatus(OtaStatusEnum.REJECTED.getKey());
-					otaManageHistoryService.add(oma.getId(),user.getUsername() + " 退回了数据！拒绝原因:"+rejectReason);
+					otaManageHistoryService.add(oma.getId(),user.getUsername() + " 退回了数据！退回原因:"+rejectReason);
 				} else {
 					//状态不对
 					msgList.add("VDR:" + oma.getVdr() + " 状态不对！");
@@ -1078,13 +1078,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 		Map<String, Object> statisticalMap = new HashMap<>();
 		statisticalMap.put("allCount", total);
 		List<Map<String, Object>> matchStatusMapList = new ArrayList<>();
-		matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_MATCHED.getKey(), toBeMatched + toBeRematched));
+		matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_MATCHED.getKey(), toBeMatched));
 		matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_APPROVED.getKey(), toBeApproved));
 		matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.LOCKED.getKey(), locked));
 		matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.REJECTED.getKey(), rejected));
+		matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_REMATCHED.getKey(), toBeRematched));
 		statisticalMap.put("matchStatusMapList", matchStatusMapList);
 
-		Map<String, Object> attestationScheduleMap = new HashMap<>();
+		Map<String, Object> matchStatusMap = new HashMap<>();
+		matchStatusMap.put(OtaStatusEnum.TO_BE_MATCHED.getKey(),toBeMatched);
+		matchStatusMap.put(OtaStatusEnum.TO_BE_APPROVED.getKey(),toBeApproved);
+		matchStatusMap.put(OtaStatusEnum.LOCKED.getKey(),locked);
+		matchStatusMap.put(OtaStatusEnum.REJECTED.getKey(),rejected);
+		matchStatusMap.put(OtaStatusEnum.TO_BE_REMATCHED.getKey(),toBeRematched);
+		statisticalMap.put("matchStatusMap", matchStatusMap);
+
 		List<Map<String, Object>> attestationScheduleMapList = new ArrayList<>();
 		attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.NOT_START.getValue(), notStart));
 		attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.IN_PROGRESS.getValue(), inProgress));
@@ -1095,6 +1103,16 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 		attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue(), stored));
 		statisticalMap.put("attestationScheduleMapList", attestationScheduleMapList);
 
+		Map<String, Object> attestationScheduleMap = new HashMap<>();
+		attestationScheduleMap.put(CertificationProgressEnum.NOT_START.getValue().replace(" ","_"),notStart);
+		attestationScheduleMap.put(CertificationProgressEnum.IN_PROGRESS.getValue().replace(" ","_"),inProgress);
+		attestationScheduleMap.put(CertificationProgressEnum.TEST_PASSED.getValue().replace(" ","_"),testPassed);
+		attestationScheduleMap.put(CertificationProgressEnum.TEST_FAILED.getValue().replace(" ","_"),testFailed);
+		attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue().replace(" ","_"),notSubmitted);
+		attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue().replace(" ","_"),submitted);
+		attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue().replace(" ","_"),stored);
+		statisticalMap.put("attestationScheduleMap", attestationScheduleMap);
+
 		return statisticalMap;
 	}
 	private Map<String,Object> wrapStatMap(String key,String val,String keyStr,Object valObj) {