Commit 38281211 by zsy

zsy

parent 011b6779
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:31:23.420</created_date> <created_date>2020/08/14 09:31:23.420</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:09:57.051</modified_date> <modified_date>2021/01/26 09:43:46.271</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -522,27 +522,30 @@ create_time, ...@@ -522,27 +522,30 @@ create_time,
modify_id, modify_id,
modify_time, modify_time,
exam_length, exam_length,
pre_length,
source_type) source_type)
select select
id, a.id,
exam_name, a.exam_name,
exam_time, a.exam_time,
exam_time_end, a.exam_time_end,
exam_model, a.exam_model,
grade_id, a.grade_id,
grade_name, a.grade_name,
school_id, b.school_id,
school_name, b.school_name,
exam_type, a.exam_type,
del_flag, a.del_flag,
status, a.status,
create_id, a.create_id,
create_time, a.create_time,
modify_id, a.modify_id,
modify_time, a.modify_time,
exam_length, a.exam_length,
a.pre_length,
1 as source_type 1 as source_type
from single_yuejuan_source.bus_exam</sql> from single_yuejuan_source.bus_exam a
inner join (select exam_id,school_id,school_name from single_yuejuan_source.bus_exam_student group exam_id,school_id,school_name) b on a.exam_id=b.exam_id</sql>
<set_params>N</set_params> <set_params>N</set_params>
<insert_field/> <insert_field/>
<update_field/> <update_field/>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:31:47.932</created_date> <created_date>2020/08/14 09:31:47.932</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:08:42.178</modified_date> <modified_date>2021/01/25 16:03:18.113</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -508,9 +508,11 @@ ...@@ -508,9 +508,11 @@
(id, (id,
exam_id, exam_id,
subject_id, subject_id,
school_id,
scan_paper_id, scan_paper_id,
record_id, record_id,
obj_ques_config_id, obj_ques_config_id,
question_number,
student_answer, student_answer,
student_score, student_score,
create_time, create_time,
...@@ -519,9 +521,11 @@ select ...@@ -519,9 +521,11 @@ select
id, id,
exam_id, exam_id,
subject_id, subject_id,
school_id,
scan_paper_id, scan_paper_id,
record_id, record_id,
obj_ques_config_id, obj_ques_config_id,
question_number,
student_answer, student_answer,
student_score, student_score,
create_time, create_time,
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:31:51.333</created_date> <created_date>2020/08/14 09:31:51.333</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:07:31.959</modified_date> <modified_date>2021/01/25 16:09:51.380</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -506,38 +506,52 @@ ...@@ -506,38 +506,52 @@
<quoteString>N</quoteString> <quoteString>N</quoteString>
<sql>insert into single_yuejuan_source_process.bus_student_subj_ques_score <sql>insert into single_yuejuan_source_process.bus_student_subj_ques_score
(id, (id,
parent_id,
exam_id, exam_id,
subject_id, subject_id,
school_id,
scan_paper_id, scan_paper_id,
record_id, record_id,
subj_ques_config_id, subj_ques_config_id,
marking_url_obj, belong_block_id,
question_number,
score,
mark_cell,
min_cell,
cut_cell,
student_score, student_score,
marking_status, marking_status,
marking_time, status,
marking_info_json,
spend_time, spend_time,
teacher_id, marking_teachers,
marking_teacher_id, re_marking_teachers,
question_status, arbitrate_teachers,
arbitrate_id,
create_time, create_time,
modify_time) modify_time)
select select
id, id,
parent_id,
exam_id, exam_id,
subject_id, subject_id,
school_id,
scan_paper_id, scan_paper_id,
record_id, record_id,
subj_ques_config_id, subj_ques_config_id,
marking_url_obj, belong_block_id,
question_number,
score,
mark_cell,
min_cell,
cut_cell,
student_score, student_score,
marking_status, marking_status,
marking_time, status,
marking_info_json,
spend_time, spend_time,
teacher_id, marking_teachers,
marking_teacher_id, re_marking_teachers,
question_status, arbitrate_teachers,
arbitrate_id,
create_time, create_time,
modify_time modify_time
from single_yuejuan_source.bus_student_subj_ques_score</sql> from single_yuejuan_source.bus_student_subj_ques_score</sql>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:31:54.776</created_date> <created_date>2020/08/14 09:31:54.776</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/12/11 14:22:16.043</modified_date> <modified_date>2021/01/25 15:56:37.124</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -514,13 +514,12 @@ question_number, ...@@ -514,13 +514,12 @@ question_number,
custom_question_number, custom_question_number,
question_type, question_type,
score, score,
img_url,
coordinate,
scan_coordinate,
belong_subject, belong_subject,
is_min_cell, is_min_cell,
is_mark_cell, is_mark_cell,
is_que_cell, is_que_cell,
is_cut_cell,
belong_block_id,
modify_id, modify_id,
modify_time, modify_time,
create_id, create_id,
...@@ -535,13 +534,12 @@ question_number, ...@@ -535,13 +534,12 @@ question_number,
custom_question_number, custom_question_number,
question_type, question_type,
score, score,
img_url,
coordinate,
scan_coordinate,
belong_subject, belong_subject,
is_min_cell, is_min_cell,
is_mark_cell, is_mark_cell,
is_que_cell, is_que_cell,
is_cut_cell,
belong_block_id,
modify_id, modify_id,
modify_time, modify_time,
create_id, create_id,
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:18:01.920</created_date> <created_date>2020/01/04 14:18:01.920</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:26:24.546</modified_date> <modified_date>2021/01/25 16:16:30.288</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -529,6 +529,11 @@ delete from single_yuejuan_source_process.bus_marking_person where exam_id = ${e ...@@ -529,6 +529,11 @@ delete from single_yuejuan_source_process.bus_marking_person where exam_id = ${e
delete from single_yuejuan_source_process.area where id in (select id from single_yuejuan_source.area); delete from single_yuejuan_source_process.area where id in (select id from single_yuejuan_source.area);
delete from single_yuejuan_source_process.student_info where id in (select id from single_yuejuan_source.student_info); delete from single_yuejuan_source_process.student_info where id in (select id from single_yuejuan_source.student_info);
delete from single_yuejuan_source_process.tenant where id in (select id from single_yuejuan_source.tenant); delete from single_yuejuan_source_process.tenant where id in (select id from single_yuejuan_source.tenant);
-------------
delete from single_yuejuan_source_process.bus_scan_model where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_scan_student_paper where exam_id = ${exam_id};
delete from single_yuejuan_source_process.bus_subjective_question_coordinate where exam_id = ${exam_id};
delete from single_yuejuan_source_process.zh_subject_spilt_score where id = ${exam_id};
------------------- -------------------
vacuum single_yuejuan_source_process.gp_exam_subject_score; vacuum single_yuejuan_source_process.gp_exam_subject_score;
...@@ -552,7 +557,12 @@ vacuum single_yuejuan_source_process.teacher; ...@@ -552,7 +557,12 @@ vacuum single_yuejuan_source_process.teacher;
vacuum single_yuejuan_source_process.bus_marking_person; vacuum single_yuejuan_source_process.bus_marking_person;
vacuum single_yuejuan_source_process.area; vacuum single_yuejuan_source_process.area;
vacuum single_yuejuan_source_process.student_info; vacuum single_yuejuan_source_process.student_info;
vacuum single_yuejuan_source_process.tenant;</sql> vacuum single_yuejuan_source_process.tenant;
---------------
vacuum single_yuejuan_source_process.bus_scan_model;
vacuum single_yuejuan_source_process.bus_scan_student_paper;
vacuum single_yuejuan_source_process.bus_subjective_question_coordinate;
vacuum single_yuejuan_source_process.zh_subject_spilt_score;</sql>
<set_params>N</set_params> <set_params>N</set_params>
<insert_field/> <insert_field/>
<update_field/> <update_field/>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date> <created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:25:17.906</modified_date> <modified_date>2021/01/25 15:27:09.914</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -582,8 +582,6 @@ exam_time_end, ...@@ -582,8 +582,6 @@ exam_time_end,
exam_model, exam_model,
grade_id, grade_id,
grade_name, grade_name,
school_id,
school_name,
exam_type, exam_type,
del_flag, del_flag,
status, status,
...@@ -591,7 +589,8 @@ create_id, ...@@ -591,7 +589,8 @@ create_id,
create_time, create_time,
modify_id, modify_id,
modify_time, modify_time,
exam_length exam_length,
pre_length
from bus_exam from bus_exam
where id=${exam_id}</sql> where id=${exam_id}</sql>
<limit>0</limit> <limit>0</limit>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date> <created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:25:07.556</modified_date> <modified_date>2021/01/26 16:50:06.499</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
<server>192.168.2.244</server> <server>192.168.2.244</server>
<type>MYSQL</type> <type>MYSQL</type>
<access>Native</access> <access>Native</access>
<database>single_yuejuan_test</database> <database>union_yuejuan_yun</database>
<port>3306</port> <port>3306</port>
<username>dev</username> <username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password> <password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date> <created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:24:13.525</modified_date> <modified_date>2021/01/25 15:28:44.387</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -578,9 +578,11 @@ ...@@ -578,9 +578,11 @@
id, id,
exam_id, exam_id,
subject_id, subject_id,
school_id,
scan_paper_id, scan_paper_id,
record_id, record_id,
obj_ques_config_id, obj_ques_config_id,
question_number,
student_answer, student_answer,
student_score, student_score,
create_time, create_time,
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date> <created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/12/11 14:14:57.676</modified_date> <modified_date>2021/01/25 15:38:58.704</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -584,13 +584,12 @@ question_number, ...@@ -584,13 +584,12 @@ question_number,
custom_question_number, custom_question_number,
question_type, question_type,
score, score,
img_url,
coordinate,
scan_coordinate,
belong_subject, belong_subject,
is_min_cell, is_min_cell,
is_mark_cell, is_mark_cell,
is_que_cell, is_que_cell,
is_cut_cell,
belong_block_id,
modify_id, modify_id,
modify_time, modify_time,
create_id, create_id,
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/08/14 09:36:00.094</created_date> <created_date>2020/08/14 09:36:00.094</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:26:12.598</modified_date> <modified_date>2021/01/27 08:45:06.717</modified_date>
<parameters> <parameters>
</parameters> </parameters>
<slaveservers> <slaveservers>
...@@ -582,84 +582,6 @@ ...@@ -582,84 +582,6 @@
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
<entry> <entry>
<name>bus_student_obj_ques_score</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
<transname>bus_student_obj_ques_score</transname>
<directory>/intelligent_test/single_yuejuan_test/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
<exec_per_row>N</exec_per_row>
<clear_rows>N</clear_rows>
<clear_files>N</clear_files>
<set_logfile>N</set_logfile>
<logfile/>
<logext/>
<add_date>N</add_date>
<add_time>N</add_time>
<loglevel>Basic</loglevel>
<cluster>N</cluster>
<slave_server_name/>
<set_append_logfile>N</set_append_logfile>
<wait_until_finished>Y</wait_until_finished>
<follow_abort_remote>N</follow_abort_remote>
<create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work>
<run_configuration/>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>672</xloc>
<yloc>240</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>bus_student_subj_ques_score</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
<transname>bus_student_subj_ques_score</transname>
<directory>/intelligent_test/single_yuejuan_test/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
<exec_per_row>N</exec_per_row>
<clear_rows>N</clear_rows>
<clear_files>N</clear_files>
<set_logfile>N</set_logfile>
<logfile/>
<logext/>
<add_date>N</add_date>
<add_time>N</add_time>
<loglevel>Basic</loglevel>
<cluster>N</cluster>
<slave_server_name/>
<set_append_logfile>N</set_append_logfile>
<wait_until_finished>Y</wait_until_finished>
<follow_abort_remote>N</follow_abort_remote>
<create_parent_folder>N</create_parent_folder>
<logging_remote_work>N</logging_remote_work>
<run_configuration/>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>416</xloc>
<yloc>240</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>bus_subjective_question_config</name> <name>bus_subjective_question_config</name>
<description/> <description/>
<type>TRANS</type> <type>TRANS</type>
...@@ -1050,18 +972,6 @@ ...@@ -1050,18 +972,6 @@
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
<entry> <entry>
<name>Success</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>624</xloc>
<yloc>528</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>bus_marking_person</name> <name>bus_marking_person</name>
<description/> <description/>
<type>TRANS</type> <type>TRANS</type>
...@@ -1100,6 +1010,43 @@ ...@@ -1100,6 +1010,43 @@
<yloc>528</yloc> <yloc>528</yloc>
<attributes_kjc/> <attributes_kjc/>
</entry> </entry>
<entry>
<name>Shell</name>
<description/>
<type>SHELL</type>
<attributes/>
<filename>/home/gpadmin/kettle/python_pkgs/bigdata_etl_test/jobs/intelligent_test/single_yuejuan/intelligent_test_single.sh</filename>
<work_directory/>
<arg_from_previous>N</arg_from_previous>
<exec_per_row>N</exec_per_row>
<set_logfile>N</set_logfile>
<logfile/>
<set_append_logfile>N</set_append_logfile>
<logext/>
<add_date>N</add_date>
<add_time>N</add_time>
<insertScript>N</insertScript>
<script/>
<loglevel>Basic</loglevel>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>608</xloc>
<yloc>528</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>Success</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>464</xloc>
<yloc>528</yloc>
<attributes_kjc/>
</entry>
</entries> </entries>
<hops> <hops>
<hop> <hop>
...@@ -1157,33 +1104,6 @@ ...@@ -1157,33 +1104,6 @@
<unconditional>N</unconditional> <unconditional>N</unconditional>
</hop> </hop>
<hop> <hop>
<from>bus_relation_student_class</from>
<to>bus_student_obj_ques_score</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>bus_student_obj_ques_score</from>
<to>bus_student_subj_ques_score</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>bus_student_subj_ques_score</from>
<to>bus_subjective_question_config</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>bus_subjective_question_config</from> <from>bus_subjective_question_config</from>
<to>class</to> <to>class</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
...@@ -1284,6 +1204,15 @@ ...@@ -1284,6 +1204,15 @@
</hop> </hop>
<hop> <hop>
<from>bus_marking_person</from> <from>bus_marking_person</from>
<to>Shell</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>Shell</from>
<to>Success</to> <to>Success</to>
<from_nr>0</from_nr> <from_nr>0</from_nr>
<to_nr>0</to_nr> <to_nr>0</to_nr>
...@@ -1291,6 +1220,15 @@ ...@@ -1291,6 +1220,15 @@
<evaluation>Y</evaluation> <evaluation>Y</evaluation>
<unconditional>N</unconditional> <unconditional>N</unconditional>
</hop> </hop>
<hop>
<from>bus_relation_student_class</from>
<to>bus_subjective_question_config</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
</hops> </hops>
<notepads> <notepads>
</notepads> </notepads>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date> <created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:40:01.025</modified_date> <modified_date>2021/01/25 15:20:12.290</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -577,7 +577,7 @@ case when (select count(*) from task_list where task_status>1)>0 ...@@ -577,7 +577,7 @@ case when (select count(*) from task_list where task_status>1)>0
then (select max(create_time) from task_list where task_status>1) then (select max(create_time) from task_list where task_status>1)
else '2000-01-01 00:00:00' end start_time else '2000-01-01 00:00:00' end start_time
from task_list from task_list
where task_status in (0,1) and del_flag=0 where task_status in (0,1) and del_flag=0 and source_type=1
order by create_time limit 1</sql> order by create_time limit 1</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:20:17.611</created_date> <created_date>2020/01/04 14:20:17.611</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:39:53.695</modified_date> <modified_date>2021/01/25 15:20:31.425</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
<schema_name/> <schema_name/>
</partitioning> </partitioning>
<connection>intelligent_single_yuejuan_test_neiwang</connection> <connection>intelligent_single_yuejuan_test_neiwang</connection>
<sql>select case when (select count(*) from task_list where task_status=1 and id=${task_id} and del_flag=0)>0 then 1 else 0 end is_run</sql> <sql>select case when (select count(*) from task_list where task_status=1 and id=${task_id} and del_flag=0 and source_type=1)>0 then 1 else 0 end is_run</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date> <created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:39:39.835</modified_date> <modified_date>2021/01/25 15:20:44.126</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -577,7 +577,7 @@ case when (select count(*) from task_list where task_status>1)>0 ...@@ -577,7 +577,7 @@ case when (select count(*) from task_list where task_status>1)>0
then (select max(create_time) from task_list where task_status>1) then (select max(create_time) from task_list where task_status>1)
else '2000-01-01 00:00:00' end start_time else '2000-01-01 00:00:00' end start_time
from task_list from task_list
where task_status=1 and del_flag=0</sql> where task_status=1 and del_flag=0 and source_type=1</sql>
<limit>0</limit> <limit>0</limit>
<lookup/> <lookup/>
<execute_each_row>N</execute_each_row> <execute_each_row>N</execute_each_row>
......
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<created_user>admin</created_user> <created_user>admin</created_user>
<created_date>2020/01/04 14:20:38.865</created_date> <created_date>2020/01/04 14:20:38.865</created_date>
<modified_user>admin</modified_user> <modified_user>admin</modified_user>
<modified_date>2020/10/28 10:39:46.221</modified_date> <modified_date>2021/01/25 15:16:54.635</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key> <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private> <is_key_private>N</is_key_private>
</info> </info>
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
<single_statement>Y</single_statement> <single_statement>Y</single_statement>
<replace_variables>Y</replace_variables> <replace_variables>Y</replace_variables>
<quoteString>N</quoteString> <quoteString>N</quoteString>
<sql>update task_list set task_status=1 where id=${task_id} and del_flag=0</sql> <sql>update task_list set task_status=1 where id=${task_id} and del_flag=0 and source_type=1</sql>
<set_params>N</set_params> <set_params>N</set_params>
<insert_field/> <insert_field/>
<update_field/> <update_field/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment