Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/domain/vo/QuantityStatisticsVO.java

@@ -7,6 +7,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -43,4 +45,17 @@ public class QuantityStatisticsVO {
 
     @ApiModelProperty("场景数量")
     private Long numberScenes;
+
+    @ApiModelProperty("已完成任务数量")
+    private Integer completedTaskNumber;
+
+    @ApiModelProperty("执行中任务数量")
+    private Integer executeTasksNumber;
+
+    @ApiModelProperty("已完成任务占比")
+    private Integer completedTaskProportion;
+
+    @ApiModelProperty("执行中任务任务占比")
+    private Integer executeTaskProportion;
+
 }

quality-review/src/main/java/com/ruoyi/service/impl/StatisticsHomeServiceImpl.java

@@ -18,11 +18,26 @@ public class StatisticsHomeServiceImpl implements StatisticsHomeService {
 
     @Override
     public QuantityStatisticsVO selectQuantityStatistics(QuantityStatisticsVO quantityStatisticsHome){
-        return statisticsHomeMapper.selectQuantityStatistics(quantityStatisticsHome);
+
+        QuantityStatisticsVO quantityStatisticsVO =  statisticsHomeMapper.selectQuantityStatistics(quantityStatisticsHome);
+        quantityStatisticsVO.setExecuteTaskProportion(percentageCalculation(quantityStatisticsVO.getExecuteTasksNumber(),quantityStatisticsVO.getCompletedTaskNumber()));
+        quantityStatisticsVO.setCompletedTaskProportion(percentageCalculation(quantityStatisticsVO.getCompletedTaskNumber(),quantityStatisticsVO.getExecuteTasksNumber()));
+        return quantityStatisticsVO;
     }
 
     @Override
     public List<StandardCategoryStatisticsVO> selectStandardCategoryStatistics(){
         return statisticsHomeMapper.selectStandardCategoryStatistics();
     }
+
+    // 计算百分比
+    public int percentageCalculation(Integer a, Integer b){
+        int total = a+b;
+        if(total == 0){
+            return 0;
+        }else {
+            float c = (float)a/total;
+            return Math.round(c*100);
+        }
+    }
 }

quality-review/src/main/resources/mapper/StatisticsHomeMapper.xml

@@ -24,7 +24,9 @@
                 ( SELECT count( id ) FROM t_sample WHERE flag = '1' AND deleted = 0 ) AS numberComponentSamples,
                 ( SELECT count( id ) FROM t_test_scenario ) AS numberScenes,
                 ( SELECT count( id ) FROM t_test_type ) AS numberMethods,
-                ( SELECT count( id ) FROM t_task WHERE vehicle_information_url IS NOT NULL ) AS numberReports
+                ( SELECT count( id ) FROM t_task WHERE vehicle_information_url IS NOT NULL ) AS numberReports,
+                ( SELECT count( id ) FROM t_task WHERE task_status = 'FINISH' ) AS completedTaskNumber,
+                ( SELECT count( id ) FROM t_task WHERE task_status = 'NEW' OR task_status = 'PENDING' ) AS executeTasksNumber
     </select>
 
     <select id="selectStandardCategoryStatistics" resultType="com.ruoyi.domain.vo.StandardCategoryStatisticsVO">