Merge pull request '628' (#97) from dev into master

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java

@@ -59,7 +59,7 @@ public class AimServiceImpl implements AimService {
             return new ArrayList<>();
         }
         //查询实例数据
-        List<ExperimentIns> byExperimentId = experimentInsService.getByExperimentId(experimentId);
+        List<ExperimentIns> byExperimentId = experimentInsService.queryByExperimentId(experimentId);
 
         if (byExperimentId == null || byExperimentId.size() == 0){
             return new ArrayList<>();
@@ -111,9 +111,10 @@ public class AimServiceImpl implements AimService {
                         List<String> datasetList = getTrainDateSet(records, aimrunId);
                         aimRunInfo.setDataset(datasetList);
                     }
+                    aimRunInfoList.add(aimRunInfo);
                 }
             }
-            aimRunInfoList.add(aimRunInfo);
+
         }
         //判断哪个最长
 

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml

@@ -14,12 +14,21 @@
         <result property="state" column="state" jdbcType="INTEGER"/>
     </resultMap>
 
-    <!--查询单个-->
+    <!-- 查询单个 -->
     <select id="queryById" resultMap="ImageMap">
         select
-        id,name,description,image_type,create_by,create_time,update_by,update_time,state
-        from image
-        where id = #{id} and state = 1
+            img.id,
+            img.name,
+            img.description,
+            img.image_type,
+            img.create_by,
+            img.create_time,
+            img.update_by,
+            img.update_time,
+            img.state,
+            (SELECT COUNT(*) FROM image_version WHERE image_version.image_id = img.id AND image_version.state = 1) as versionCount
+        from image img
+        where img.id = #{id} and img.state = 1
     </select>
 
     <!--查询指定行数据-->