Parcourir la source

车辆删除,同事删除海康的数据

dzx il y a 5 mois
Parent
commit
b39ab8e4ca

+ 1 - 1
src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -94,7 +94,7 @@ public class JianyuekbScheduleTask {
             String classIds = gradeClassMaps.get(eduYearSerialNo).toString().replace("[", "").replace("]", "");
             String delSql = "delete from course_table where schedule_date between '" + startDateStr + "'" +
                     " and '" + endDateStr +
-                    " and class_id in (" + classIds + ")";
+                    "' and class_id in (" + classIds + ")";
             SqlRunnerAdapter.db().delete(delSql);
 
             long between = ChronoUnit.DAYS.between(startDateObj, endDateObj);

+ 2 - 1
src/main/resources/mapper/classtime/ClassTimeStatisticsMapper.xml

@@ -57,9 +57,10 @@
         INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value
         INNER JOIN course_table_bak t3 ON t1.id = t3.wf_course_adjust_id
         LEFT JOIN class_time t4 ON t3.time_period = t4.time_period AND t3.time_number = t4.number
+        <!-- INNER JOIN course_table t5 ON t5.id = t3.id-->
         WHERE t1.delete_mark = 0 AND t2.current_state = 'COMPLETED'
         <!-- AND t1.reason IN ('sick_leave','leave_absence') -->
-        and t1.adjust_type = 'course_substitute'
+        and t1.adjust_type = 'course_substitute' and t1.enabled_mark = 1
         AND t3.schedule_date BETWEEN #{dto.startDate} and #{dto.endDate}
         AND t3.schedule_date NOT IN (
             SELECT DATE FROM holiday_date WHERE STATUS = 3

+ 1 - 1
src/test/java/com/xjrsoft/module/job/JianyuekbScheduleTaskTest.java

@@ -47,7 +47,7 @@ class JianyuekbScheduleTaskTest {
     @Test
     public void RefreshConnectionPool() throws Exception {
         String active = SpringUtil.getActiveProfile();
-        String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback IS NULL";
+        String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback = -1";
         List<Map<String, Object>> receiveMsgs = SqlRunnerAdapter.db().selectList(sql, CourseReceiveMsg.class);
         if(receiveMsgs.isEmpty()){
             return;