Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang

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

@@ -50,7 +50,7 @@ public class StatisticsHomeServiceImpl implements StatisticsHomeService {
        InspectionItemPassedNumVO inspectionItemPassedNumVO =  statisticsHomeMapper.selectInspectionItemPassedNum();
        List<AverageInspectionRateVO> list = new ArrayList<>();
        AverageInspectionRateVO averageInspectionRateOne = new AverageInspectionRateVO();
-       averageInspectionRateOne.setInspectionItems("信息安全管理体系要求");
+       averageInspectionRateOne.setInspectionItems("汽车信息安全管理体系要求");
        averageInspectionRateOne.setPassingRate(proportionCalculation(inspectionItemPassedNumVO.getSysReviewPassedNum(), inspectionItemPassedNumVO.getSysReviewcompletedNum()));
         list.add(averageInspectionRateOne);
        AverageInspectionRateVO averageInspectionRateTwo = new AverageInspectionRateVO();

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

@@ -9,7 +9,7 @@
         SELECT
                 ( SELECT count( id ) FROM t_standard ) AS standardQuantity,
                 ( SELECT count( id ) FROM t_test_usecase ) AS numberUseCases,
-                ( SELECT count( id ) FROM t_task ) AS numberTasks,
+                ( SELECT count( id ) FROM t_task  WHERE task_status != 'TEMPORARILY' ) AS numberTasks,
                 ( SELECT count( id ) FROM t_automobile_enterprise WHERE deleted = 0 ) AS numberCompanies,
                 (
                     SELECT
@@ -26,7 +26,7 @@
                 ( 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' ) AS executeTasksNumber
+                ( SELECT count( id ) FROM t_task WHERE task_status = 'NEW' OR task_status = 'PENDING' OR task_status = 'SIGNED') AS executeTasksNumber
     </select>
 
     <select id="selectStandardCategoryStatistics" resultType="com.ruoyi.domain.vo.StandardCategoryStatisticsVO">
@@ -62,10 +62,12 @@
     <select id="selectTaskParticipationStatistics" resultType="com.ruoyi.domain.vo.TaskParticipationStatisticsVO">
         SELECT
             count( task_id ) AS taskNum,
-            NAME AS userName
+            tur.user_id,
+            su.nick_name AS userName
         FROM
-            t_task_user_relation
+            t_task_user_relation tur
+                LEFT JOIN sys_user su ON su.user_id = tur.user_id
         GROUP BY
-            user_id,NAME
+            tur.user_id
     </select>
 </mapper>
\ No newline at end of file