martin преди 2 години
родител
ревизия
521583d2d8
променени са 1 файла, в които са добавени 8 реда и са изтрити 5 реда
  1. 8 5
      simulation-resource-server/src/main/resources/mapper/project/SimulationProjectTaskMapper.xml

+ 8 - 5
simulation-resource-server/src/main/resources/mapper/project/SimulationProjectTaskMapper.xml

@@ -156,13 +156,16 @@
 
     <!--运行任务状态-->
     <select id="selectRunTaskByState" parameterType="java.util.Map" resultType="java.util.Map">
-        select count(run_state) num,run_state runState from simulation_manual_project_task
-        where
-        is_deleted = '0'
+        select count(1) num, smpt.run_state runState
+        from simulation_manual_project_task smpt
+        left join simulation_manual_project smp on smpt.p_id = smp.id
+        left join simulation_automatic_subproject sas on smpt.p_id = sas.id
+        where smpt.is_deleted = '0'
+        and (smp.is_deleted = '0' or sas.is_deleted = '0')
         <if test="createUserId != null and createUserId != ''">
-            and create_user_id=#{createUserId,jdbcType=VARCHAR}
+            and smpt.create_user_id = #{createUserId}
         </if>
-        group by run_state
+        group by smpt.run_state
     </select>
 
     <!--查询场景不等于0的得分的数量-->