课表数据同步调整

src/main/resources/sqlScript/鸿合课表视图.sql

@@ -1,5 +1,5 @@
 CREATE VIEW course_table_view AS
-SELECT t1.class_id,t1.class_name,t1.teacher_name,t1.course_name, t2.short_name,t1.weeks_cn,t1.schedule_date,t1.start_time,t1.end_time FROM course_table t1
+SELECT DISTINCT t1.class_id,t1.class_name,t1.teacher_name,t1.course_name, t2.short_name,t1.weeks_cn,t1.schedule_date,t1.start_time,t1.end_time FROM course_table t1
 LEFT JOIN class_time t2 ON t1.time_number = t2.number
 LEFT JOIN base_semester t3 ON t1.base_semester_id = t3.id
-WHERE t1.schedule_date >= DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY);
+WHERE t1.schedule_date BETWEEN DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY) AND DATE_ADD(CURDATE(), INTERVAL (6 - WEEKDAY(CURDATE())) DAY);

src/test/java/com/xjrsoft/module/liteflow/node/ImportStudentFaceNodeTest.java

@@ -41,12 +41,31 @@ class ImportStudentFaceNodeTest {
     private FaceImportMapper faceImportMapper;
     @Test
     void test(){
-        String sql = "SELECT t3.* FROM stundent_face_process t1\n" +
-                "INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value\n" +
-                "INNER JOIN xjr_user t3 ON t1.user_id = t3.id\n" +
-                "WHERE t2.current_state = 'COMPLETED'\n" +
-                "AND t1.create_date > '2025-05-05 0:00:00'\n" +
-                "AND t1.hikvision_result LIKE '%The required parameter personId is null.\",%'\n";
+        String sql = "SELECT t1.* FROM xjr_user t1\n" +
+                "WHERE t1.delete_mark = 0 \n" +
+                "AND t1.credential_number IN (\n" +
+                "\tSELECT t3.credential_number\n" +
+                "        FROM student_report_record t1\n" +
+                "        INNER JOIN base_new_student t3 ON t3.id = t1.user_id\n" +
+                "        LEFT JOIN banding_task_class_student t2 ON t1.user_id = t2.new_student_id AND t2.delete_mark = 0\n" +
+                "        LEFT JOIN banding_task_class t5 ON t2.banding_task_class_id = t5.id\n" +
+                "        LEFT JOIN xjr_user t6 ON t5.teacher_id = t6.id\n" +
+                "        LEFT JOIN xjr_dictionary_detail t7 ON t3.gender = t7.code AND t7.delete_mark = 0\n" +
+                "        LEFT JOIN xjr_dictionary_detail t8 ON t3.source = t8.code AND t8.delete_mark = 0\n" +
+                "        LEFT JOIN xjr_dictionary_detail t9 ON t3.stduy_status = t9.code AND t9.delete_mark = 0\n" +
+                "        LEFT JOIN banding_task t10 ON t5.banding_task_id = t10.id\n" +
+                "        LEFT JOIN enrollment_plan t11 ON t11.id = t3.enrollment_plan_id\n" +
+                "        LEFT JOIN base_grade t4 ON t11.grade_id = t4.id\n" +
+                "        LEFT JOIN student_report_plan t12 ON t12.id = t1.student_report_plan_id\n" +
+                "        LEFT JOIN base_major_set t13 ON t13.id = t5.major_set_id\n" +
+                "        LEFT JOIN xjr_dictionary_detail t14 ON t5.class_type = t14.code AND t14.delete_mark = 0\n" +
+                "        LEFT JOIN xjr_department t15 ON t15.id = t13.department_id\n" +
+                "        WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1\n" +
+                "        AND t12.status IN(1,2)\n" +
+                "        AND t3.enrollment_plan_id = 1897950348853186562\n" +
+                "        AND t12.category = 2\n" +
+                "        AND t1.report_time IS NOT NULL\n" +
+                ")";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
 
         ApiUtil apiUtil = new ApiUtil();
@@ -88,7 +107,7 @@ class ImportStudentFaceNodeTest {
                 if(dataJson.get("total").getAsInt() > 0){
                     JsonArray personPhoto = dataJson.get("list").getAsJsonArray().get(0)
                             .getAsJsonObject().get("personPhoto").getAsJsonArray();
-                    if(personPhoto.size() == 0){
+                    if(personPhoto.size() != 0){
                         dataObj.setStatus(1);
                         dataObj.setExamStatus(1);
                         String studentHikvisionId = hikvisionDataMapper.getStudentHikvisionId(dataObj.getUserId());