教育培训统计bug修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -1185,6 +1185,9 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         vars.put("rejected", "1");
         getCheckUser(tHazardWorkPlan, vars);
         completeTask.setVars(vars);
+        // 添加日志验证
+        log.info("设置的流程变量 - checkUser: {}, workSiteResponsible: {}",
+                vars.get("checkUser"), vars.get("workSiteResponsible"));
         wfTaskController.completeTask(completeTask).getData().getResult();
         //清除已经选过的人员
         String licenseCheckUser = removeLastPart(tHazardWorkPlan.getLicenseCheckUser());
@@ -1217,6 +1220,7 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
 
         String licenseCheckUsers = tHazardWorkPlan.getLicenseCheckUser();
 
+
         if (StringUtils.isBlank(licenseCheckUsers)) {
             map.remove("checkUser");
             map.put("workSiteResponsible", tHazardWorkPlan.getWorkSiteResponsible());

zlmy-modules/zlmy-boot/src/main/resources/mapper/train/myManagement/TTrainTestQuestionsExercise.xml

@@ -30,7 +30,7 @@
             resultType="com.testor.module.train.myManagement.model.domain.TTrainTestQuestionsExercise">
         select * from t_train_test_questions_exercise
         where test_questions_id in(
-        select test_questions_id from t_train_paper
+        select DISTINCT unnest(string_to_array(test_questions_id, ',')) as question_id from t_train_paper
         where id in(
         select paper_id from t_train_examination_manage where id = #{id} and status = '0')
         )

zlmy-modules/zlmy-boot/src/main/resources/mapper/train/project/TTrainProject.xml

@@ -549,7 +549,7 @@
 
     <select id="findScoreRepairTest" resultType="java.lang.String">
         SELECT
-            m.test_score
+            m.repair_test
         FROM
             t_train_my_management m
         WHERE
@@ -562,7 +562,7 @@
                 WHERE
                     p.id = #{projectId}
                   AND p.is_add_exam = '1'
-            ) AND m.test_score IS NOT NULL
+            ) AND m.repair_test IS NOT NULL
 
     </select>