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

@@ -19,7 +19,7 @@ public class QuantityStatisticsVO {
     @ApiModelProperty("支持标准数量")
     private Long standardQuantity;
 
-    @ApiModelProperty("测试用例数量")
+    @ApiModelProperty("测试用例数量科恩获取")
     private Long numberUseCases;
 
     @ApiModelProperty("任务数量")
@@ -40,10 +40,10 @@ public class QuantityStatisticsVO {
     @ApiModelProperty("零部件样品数量")
     private Long numberComponentSamples;
 
-    @ApiModelProperty("测试方法数量")
+    @ApiModelProperty("测试方法数量科恩获取")
     private Long numberMethods;
 
-    @ApiModelProperty("场景数量")
+    @ApiModelProperty("场景数量科恩获取")
     private Long numberScenes;
 
     @ApiModelProperty("已完成任务数量")

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

@@ -19,6 +19,7 @@
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
+
     <select id="findByTaskId" resultType="com.ruoyi.domain.ReviewEnterpriseArchive">
         SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time FROM t_review_enterprise_archive WHERE task_id = #{taskId}
     </select>

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

@@ -8,7 +8,6 @@
     <select id="selectQuantityStatistics" resultType="com.ruoyi.domain.vo.QuantityStatisticsVO" parameterType="com.ruoyi.domain.vo.QuantityStatisticsVO">
         SELECT
                 ( SELECT count( id ) FROM t_standard ) AS standardQuantity,
-                ( SELECT count( id ) FROM t_test_usecase ) AS numberUseCases,
                 ( SELECT count( id ) FROM t_task  WHERE task_status != 'TEMPORARILY' ) AS numberTasks,
                 ( SELECT count( id ) FROM t_automobile_enterprise WHERE deleted = 0 ) AS numberCompanies,
                 (
@@ -22,8 +21,6 @@
                 ) AS numberInspectors,
                 ( SELECT count( id ) FROM t_sample WHERE flag = '0' AND deleted = 0 ) AS numberVehicleSamples,
                 ( 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 task_status = 'FINISH' ) AS completedTaskNumber,
                 ( SELECT count( id ) FROM t_task WHERE task_status = 'NEW' OR task_status = 'PENDING' OR task_status = 'SIGNED') AS executeTasksNumber
@@ -45,6 +42,8 @@
            confidentiality_level AS name
         FROM
            t_task
+        WHERE
+           confidentiality_level IS NOT NULL AND confidentiality_level != ''
         GROUP BY
            confidentiality_level
     </select>