From 565f19edbb1eff36798485ec71dfd42d1fc3e831 Mon Sep 17 00:00:00 2001
From: wuwendi <646907729@qq.com>
Date: Wed, 9 Nov 2022 15:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E5=90=91=E7=9C=8B=E6=9D=BF=E7=B3=BB?=
 =?UTF-8?q?=E7=B5=B1-=E6=95=B4=E6=9C=BA=E8=AE=A1=E5=88=92=E3=80=81?=
 =?UTF-8?q?=E5=85=A8=E6=99=AF=E6=95=B4=E6=9C=BA=E3=80=81=E6=9D=BF=E5=8D=A1?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E3=80=81=E5=85=A8=E6=99=AF=E6=9D=BF=E5=8D=A1?=
 =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/impl/BoardPlanServiceImpl.java       |  2 +-
 .../plan/impl/WholePlanServiceImpl.java       |  2 +-
 .../resources/mapper/BoardOverallMapper.xml   | 22 +++++++++----------
 .../resources/mapper/WholeOverallMapper.xml   | 12 +++++-----
 .../src/views/plan/version/detail-board.vue   |  2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/BoardPlanServiceImpl.java b/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/BoardPlanServiceImpl.java
index fb00a85..d655c21 100644
--- a/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/BoardPlanServiceImpl.java
+++ b/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/BoardPlanServiceImpl.java
@@ -184,7 +184,7 @@ public class BoardPlanServiceImpl implements BoardPlanService {
                 json.put("x86Count", releaseX86Count.size());
                 json.put("arm64Count", releaseArm64Count.size());
                 if (date.getTime() > releaseEndTime.getTime() && (releaseX86Count.size() == 0
-                        || releaseArm64Count.size() == 0)) {
+                        && releaseArm64Count.size() == 0)) {
                     stageNotSupportCount.getAndIncrement();
                 }
                 stageTableObject.add(json);
diff --git a/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/WholePlanServiceImpl.java b/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/WholePlanServiceImpl.java
index 6371be1..c8d0e50 100644
--- a/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/WholePlanServiceImpl.java
+++ b/tools/southbound/southbound-service/src/main/java/com/openeuler/southbound/service/plan/impl/WholePlanServiceImpl.java
@@ -134,12 +134,12 @@ public class WholePlanServiceImpl implements WholePlanService {
         AtomicInteger fitCount = new AtomicInteger();
         AtomicInteger sum = new AtomicInteger();
         models.forEach(item -> {
-            JSONObject json = new JSONObject();
             List<WholeFactory> wfList = wholePlanMapper.queryModelTables(wholeFactory, item, versionName);
             if (wfList.size() == 0) {
                 return;
             }
             wfList.forEach(wf -> {
+                JSONObject json = new JSONObject();
                 json.put("model", item);
                 json.put("cpuFactory", wf.getCpuFactory());
                 json.put("cpuModel", wf.getCpuModel());
diff --git a/tools/southbound/southbound-service/src/main/resources/mapper/BoardOverallMapper.xml b/tools/southbound/southbound-service/src/main/resources/mapper/BoardOverallMapper.xml
index a2bb965..8c0069e 100644
--- a/tools/southbound/southbound-service/src/main/resources/mapper/BoardOverallMapper.xml
+++ b/tools/southbound/southbound-service/src/main/resources/mapper/BoardOverallMapper.xml
@@ -14,11 +14,11 @@
 
     <!--查询板卡-->
     <select id="queryAll" resultMap="FilterResultMap">
-        SELECT cf.chip_factory, bf.board_type, cf.chip_model, bf.typical_board_model,
-        bf.extend_board_model, vp.version_name, bf.create_time FROM `board_factory` bf
-        left JOIN `chip_factory` cf ON cf.chip_id = bf.chip_id
-        left join chip_version cv on cf.chip_id = cv.chip_id
-        left join version_plan vp on vp.version_id = cv.version_id
+        SELECT cf.chip_factory, bf.board_type, cf.chip_model, bf.typical_board_model, bf.extend_board_model,
+        vp.version_name, bf.create_time
+        FROM `board_factory` bf
+        INNER JOIN `chip_factory` cf ON cf.chip_id = bf.chip_id,
+        `version_plan` vp
         <where>
             <if test="versionId != null and versionId != ''">
                 vp.version_id IN
@@ -64,7 +64,7 @@
     <!--板卡计划查找 （典型x86）-->
     <select id="queryTypicalModelStatusX86FromPlan" resultType="int">
         SELECT COUNT(*) FROM `board_plan` bp
-        LEFT JOIN `version_plan` vp ON bp.version_id = vp.version_id
+        INNER JOIN `version_plan` vp ON bp.version_id = vp.version_id
         WHERE bp.chip_factory = #{chipFactory}
         AND vp.version_name = #{versionName}
         AND (FIND_IN_SET(#{typicalBoardModel}, bp.beta_list)
@@ -113,11 +113,11 @@
 
     <!--导出所有板卡数据-->
     <select id="exportAllData" resultMap="FilterResultMap">
-        SELECT cf.chip_factory, bf.board_type, cf.chip_model, bf.typical_board_model,
-        bf.extend_board_model, vp.version_name, bf.create_time FROM `board_factory` bf
-        LEFT JOIN `chip_factory` cf ON cf.chip_id = bf.chip_id
-        LEFT JOIN chip_version cv on cf.chip_id = cv.chip_id
-        LEFT JOIN version_plan vp on vp.version_id = cv.version_id
+        SELECT cf.chip_factory, bf.board_type, cf.chip_model, bf.typical_board_model, bf.extend_board_model,
+        vp.version_name, bf.create_time
+        FROM `board_factory` bf
+        INNER JOIN `chip_factory` cf ON cf.chip_id = bf.chip_id,
+        `version_plan` vp
         ORDER BY bf.create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/tools/southbound/southbound-service/src/main/resources/mapper/WholeOverallMapper.xml b/tools/southbound/southbound-service/src/main/resources/mapper/WholeOverallMapper.xml
index 46245fe..4516e10 100644
--- a/tools/southbound/southbound-service/src/main/resources/mapper/WholeOverallMapper.xml
+++ b/tools/southbound/southbound-service/src/main/resources/mapper/WholeOverallMapper.xml
@@ -19,9 +19,8 @@
         SELECT wf.whole_factory, cf.cpu_factory, cf.cpu_model, wf.hardware_model, wf.extend_model,
         cf.architecture, vp.version_name, vp.version_id, wf.create_time
         FROM `whole_factory` wf
-        LEFT JOIN cpu_factory cf ON wf.cpu_id = cf.cpu_id
-        LEFT JOIN cpu_version cv on cf.cpu_id = cv.cpu_id
-        LEFT JOIN version_plan vp on vp.version_id = cv.version_id
+        INNER JOIN `cpu_factory` cf ON cf.cpu_id = wf.cpu_id,
+        `version_plan` vp
         <where>
             <if test="versionId != null and versionId != ''">
                 vp.version_id IN
@@ -72,7 +71,7 @@
     <!-- 查询全景整机列表版本是否在适配计划中 -->
     <select id="queryHardwareModelStatusForPlan" resultType="int">
         SELECT COUNT(*) FROM `whole_plan` wp
-        LEFT JOIN `version_plan` vp ON wp.version_id = vp.version_id
+        INNER JOIN `version_plan` vp ON wp.version_id = vp.version_id
         WHERE wp.whole_factory = #{hardwareFactory}
         AND vp.version_name = #{versionName}
         AND (FIND_IN_SET(#{hardwareModel}, wp.beta_list)
@@ -84,9 +83,8 @@
         SELECT wf.whole_factory, cf.cpu_factory, cf.cpu_model, wf.hardware_model, wf.extend_model,
         cf.architecture, vp.version_name, vp.version_id, wf.create_time
         FROM `whole_factory` wf
-        LEFT JOIN cpu_factory cf ON wf.cpu_id = cf.cpu_id
-        LEFT JOIN cpu_version cv on cf.cpu_id = cv.cpu_id
-        LEFT JOIN version_plan vp on vp.version_id = cv.version_id
+        INNER JOIN `cpu_factory` cf ON cf.cpu_id = wf.cpu_id,
+        `version_plan` vp
         ORDER BY wf.create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/tools/southbound/southbound-view/src/views/plan/version/detail-board.vue b/tools/southbound/southbound-view/src/views/plan/version/detail-board.vue
index 52d930b..3ba1bd5 100644
--- a/tools/southbound/southbound-view/src/views/plan/version/detail-board.vue
+++ b/tools/southbound/southbound-view/src/views/plan/version/detail-board.vue
@@ -125,7 +125,7 @@ export default {
         adapting = [];
       dataList.forEach(item => {
         if (item.model) {
-          if (item.x86Count > 0 && item.arm64Count > 0) {
+          if (item.x86Count > 0 || item.arm64Count > 0) {
             adaptedList.push(item.model);
           } else {
             adapting.push(item.model);
-- 
Gitee