Commit c7b47799 by zsy

zsy

parent f9f4a645
......@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:21:41.533</created_date>
<modified_user>admin</modified_user>
<modified_date>2021/03/09 16:20:59.865</modified_date>
<modified_date>2021/07/26 14:01:56.678</modified_date>
<parameters>
</parameters>
<slaveservers>
......@@ -336,45 +336,6 @@
<attributes_kjc/>
</entry>
<entry>
<name>monitor_exam</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
<transname>monitor_exam</transname>
<directory>/intelligent/union_yuejuan/transfer</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>Pentaho local</run_configuration>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>80</xloc>
<yloc>304</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>stage_roll_back</name>
<description/>
<type>SET_VARIABLES</type>
......@@ -1009,15 +970,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
<from>monitor_exam</from>
<to>Success 2</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>write_log_success</from>
<to>stage_roll_back</to>
<from_nr>0</from_nr>
......@@ -1072,15 +1024,6 @@
<unconditional>Y</unconditional>
</hop>
<hop>
<from>update_state</from>
<to>monitor_exam</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>write_log_success (3)</from>
<to>fundamental_stage</to>
<from_nr>0</from_nr>
......@@ -1143,6 +1086,15 @@
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>update_state</from>
<to>Success 2</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
</hops>
<notepads>
</notepads>
......
......@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:34.169</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:00:47.997</modified_date>
<modified_date>2021/07/26 10:55:08.265</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
<server>192.168.4.248</server>
<server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_dev</database>
<database>intelligent</database>
<port>5432</port>
<username>yuejuan</username>
<password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
<username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -503,31 +503,29 @@
<single_statement>N</single_statement>
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
<sql>insert into union_yuejuan_source_process.area
( id,
name,
child_count,
parent_id,
full_name,
level,
modify_time,
create_time,
lng,
lat,
position)
<sql>insert into single_yuejuan_source_process.area
(id,
created_time,
deleted,
modified_time,
child_count,
full_name,
level,
name,
parent_id,
ordinal)
select
id,
name,
child_count,
parent_id,
full_name,
level,
modify_time,
create_time,
lng,
lat,
position
from union_yuejuan_source.area</sql>
id,
created_time,
deleted,
modified_time,
child_count,
full_name,
level,
name,
parent_id,
ordinal
from single_yuejuan_source.area</sql>
<set_params>N</set_params>
<insert_field/>
<update_field/>
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:35.307</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:00:31.332</modified_date>
<modified_date>2021/07/26 10:57:17.232</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
<server>192.168.4.248</server>
<server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_dev</database>
<database>intelligent</database>
<port>5432</port>
<username>yuejuan</username>
<password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
<username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -510,8 +510,6 @@ exam_id,
school_id,
detail_name,
name,
manager,
manager_phone,
pre_code,
create_id,
create_time,
......@@ -523,8 +521,6 @@ exam_id,
school_id,
detail_name,
name,
manager,
manager_phone,
pre_code,
create_id,
create_time,
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:03:57.584</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:00:24.711</modified_date>
<modified_date>2021/07/26 10:58:06.674</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
<server>192.168.4.248</server>
<server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_dev</database>
<database>intelligent</database>
<port>5432</port>
<username>yuejuan</username>
<password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
<username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -515,6 +515,7 @@ class_id,
class_name,
student_id,
student_name,
login_name,
student_number,
exam_number,
student_type,
......@@ -535,6 +536,7 @@ class_id,
class_name,
student_id,
student_name,
login_name,
student_number,
exam_number,
student_type,
......
......@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:38.325</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 10:59:38.234</modified_date>
<modified_date>2021/07/26 13:29:42.107</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
<server>192.168.4.248</server>
<server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_dev</database>
<database>intelligent</database>
<port>5432</port>
<username>yuejuan</username>
<password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
<username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -507,6 +507,7 @@
( id,
exam_id,
user_id,
login_name,
name,
phone,
school_id,
......@@ -520,6 +521,7 @@ select
id,
exam_id,
user_id,
login_name,
name,
phone,
school_id,
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:04:43.521</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:01:30.099</modified_date>
<modified_date>2021/07/26 13:47:37.564</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
<server>192.168.4.248</server>
<server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_dev</database>
<database>intelligent</database>
<port>5432</port>
<username>yuejuan</username>
<password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
<username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -505,57 +505,25 @@
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
<sql>insert into union_yuejuan_source_process.teacher
(id,
school_id,
job_num,
phone_num,
gender,
name,
card_num,
card_area_id,
card_detail_id,
home_address_area,
home_detail_address,
high_education,
marital_status,
nation_id,
politic_countenance,
post_id,
entry_date,
birth_day,
professional_qualificationl_id,
incumbency,
emergency_contact,
emergency_contact_phone,
user_state,
modify_time,
create_time)
(user_id,
job_number,
created_by,
created_time,
deleted,
modified_time,
job_status,
position_id,
station_id)
select
id,
school_id,
job_num,
phone_num,
gender,
name,
card_num,
card_area_id,
card_detail_id,
home_address_area,
home_detail_address,
high_education,
marital_status,
nation_id,
politic_countenance,
post_id,
entry_date,
birth_day,
professional_qualificationl_id,
incumbency,
emergency_contact,
emergency_contact_phone,
user_state,
modify_time,
create_time
user_id,
job_number,
created_by,
created_time,
deleted,
modified_time,
job_status,
position_id,
station_id
from union_yuejuan_source.teacher</sql>
<set_params>N</set_params>
<insert_field/>
......
......@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:48.037</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 10:56:57.974</modified_date>
<modified_date>2021/07/26 13:47:57.300</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
<server>192.168.4.248</server>
<server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_dev</database>
<database>intelligent</database>
<port>5432</port>
<username>yuejuan</username>
<password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
<username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -504,37 +504,31 @@
<replace_variables>Y</replace_variables>
<quoteString>N</quoteString>
<sql>insert into union_yuejuan_source_process.tenant
( id,
tenant_name,
another_name,
open_flag,
init_flag,
open_time,
remark,
tenant_type,
address_area_id,
address_detail,
postal_code,
state,
modify_time,
create_time,
use_type)
(id,
created_by,
created_time,
deleted,
modified_time,
address_id,
alias,
name,
remark,
state,
type,
english)
select
id,
tenant_name,
another_name,
open_flag,
init_flag,
open_time,
remark,
tenant_type,
address_area_id,
address_detail,
postal_code,
state,
modify_time,
create_time,
use_type
id,
created_by,
created_time,
deleted,
modified_time,
address_id,
alias,
name,
remark,
state,
type,
english
from union_yuejuan_source.tenant</sql>
<set_params>N</set_params>
<insert_field/>
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:18:01.920</created_date>
<modified_user>admin</modified_user>
<modified_date>2021/01/12 09:10:40.296</modified_date>
<modified_date>2021/07/23 17:49:40.461</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_greenplum_neiwang</name>
<server>192.168.4.248</server>
<server>10.1.103.241</server>
<type>POSTGRESQL</type>
<access>Native</access>
<database>intelligent_dev</database>
<database>intelligent</database>
<port>5432</port>
<username>yuejuan</username>
<password>Encrypted 2be98afc86ade8781a10caf7efe98bbc3</password>
<username>gpadmin</username>
<password>Encrypted 2be98afc86aa7f2e4cb13ba69fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -523,13 +523,16 @@ delete from union_yuejuan_source_process.dic_question_type where id in (select i
delete from union_yuejuan_source_process.dic_select_subject where id in (select id from union_yuejuan_source.dic_select_subject);
delete from union_yuejuan_source_process.report_exam_subject where exam_id = ${exam_id};
delete from union_yuejuan_source_process.bus_exam_subject where id in (select id from union_yuejuan_source.bus_exam_subject);
delete from union_yuejuan_source_process.class where id in (select id from union_yuejuan_source.class);
delete from union_yuejuan_source_process.teacher where id in (select id from union_yuejuan_source.teacher);
-----------------------------------------
delete from union_yuejuan_source_process.bus_marking_person where exam_id = ${exam_id};
delete from union_yuejuan_source_process.student_info where id in (select id from union_yuejuan_source.student_info);
delete from union_yuejuan_source_process.student where user_id in (select user_id from union_yuejuan_source.student_info);
delete from union_yuejuan_source_process.user where id in (select id from union_yuejuan_source.user);
delete from union_yuejuan_source_process.tenant where id in (select id from union_yuejuan_source.tenant);
delete from union_yuejuan_source_process.school_class where id in (select id from union_yuejuan_source.school_class);
delete from union_yuejuan_source_process.area where id in (select id from union_yuejuan_source.area);
delete from union_yuejuan_source_process.teacher where user_id in (select user_id from union_yuejuan_source.teacher);
delete from union_yuejuan_source_process.header_teacher where id in (select id from union_yuejuan_source.header_teacher);
-------------
delete from union_yuejuan_source_process.bus_scan_model where exam_id = ${exam_id};
delete from union_yuejuan_source_process.bus_scan_student_paper where exam_id = ${exam_id};
......@@ -539,6 +542,9 @@ delete from union_yuejuan_source_process.zh_subject_spilt_score where id = ${exa
--------------------
vacuum union_yuejuan_source_process.gp_exam_subject_score;
vacuum union_yuejuan_source_process.gp_exam_subject_student;
......@@ -556,13 +562,15 @@ vacuum union_yuejuan_source_process.bus_student_obj_ques_score;
vacuum union_yuejuan_source_process.bus_student_subj_ques_score;
vacuum union_yuejuan_source_process.bus_subjective_question_config;
vacuum union_yuejuan_source_process.report_exam_subject;
vacuum union_yuejuan_source_process.class;
vacuum union_yuejuan_source_process.teacher;
-----------------
vacuum union_yuejuan_source_process.bus_marking_person;
vacuum union_yuejuan_source_process.student_info;
vacuum union_yuejuan_source_process.tenant;
vacuum union_yuejuan_source_process.area;
vacuum single_yuejuan_source_process.bus_marking_person;
vacuum single_yuejuan_source_process.area;
vacuum single_yuejuan_source_process.student;
vacuum single_yuejuan_source_process.tenant;
vacuum single_yuejuan_source_process.user;
vacuum single_yuejuan_source_process.school_class;
vacuum single_yuejuan_source_process.header_teacher;
---------------
vacuum union_yuejuan_source_process.bus_scan_model;
vacuum union_yuejuan_source_process.bus_scan_student_paper;
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:06:53.149</modified_date>
<modified_date>2021/07/23 16:20:47.389</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -590,7 +590,8 @@ create_time,
modify_id,
modify_time,
exam_length,
pre_length
pre_length,
source_type
from bus_exam
where id=${exam_id}</sql>
<limit>0</limit>
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:44:51.132</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:06:46.702</modified_date>
<modified_date>2021/07/23 16:21:55.852</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -580,8 +580,6 @@ exam_id,
school_id,
detail_name,
name,
manager,
manager_phone,
pre_code,
create_id,
create_time,
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:06:38.997</modified_date>
<modified_date>2021/07/23 16:22:28.269</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -585,6 +585,7 @@ class_id,
class_name,
student_id,
student_name,
login_name,
student_number,
exam_number,
student_type,
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:06:16.793</modified_date>
<modified_date>2021/07/23 16:24:19.444</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
<modified_date>2021/01/13 11:08:27.386</modified_date>
<modified_date>2021/07/23 17:22:29.130</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:03:36.796</modified_date>
<modified_date>2021/07/23 17:33:17.367</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......
......@@ -8,7 +8,7 @@
<created_user>admin</created_user>
<created_date>2020/08/08 13:08:10.767</created_date>
<modified_user>admin</modified_user>
<modified_date>2021/03/04 13:56:50.471</modified_date>
<modified_date>2021/07/23 17:42:20.296</modified_date>
<parameters>
</parameters>
<slaveservers>
......@@ -777,31 +777,6 @@
<attributes_kjc/>
</entry>
<entry>
<name>Shell</name>
<description/>
<type>SHELL</type>
<attributes/>
<filename>/home/gpadmin/kettle/python_pkgs_new/bigdata_etl_test/jobs/intelligent_test/union_yuejuan/intelligent_test_union.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>1168</xloc>
<yloc>352</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>zh_subject_spilt_score</name>
<description/>
<type>TRANS</type>
......@@ -919,18 +894,6 @@
<attributes_kjc/>
</entry>
<entry>
<name>Success</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1312</xloc>
<yloc>352</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>teacher</name>
<description/>
<type>TRANS</type>
......@@ -970,14 +933,14 @@
<attributes_kjc/>
</entry>
<entry>
<name>student_info</name>
<name>student</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
<transname>student_info</transname>
<transname>student</transname>
<directory>/intelligent/union_yuejuan/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
......@@ -1048,14 +1011,14 @@
<attributes_kjc/>
</entry>
<entry>
<name>class</name>
<name>school_class</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
<transname>class</transname>
<transname>school_class</transname>
<directory>/intelligent/union_yuejuan/transfer/source</directory>
<arg_from_previous>N</arg_from_previous>
<params_from_previous>N</params_from_previous>
......@@ -1203,6 +1166,121 @@
<yloc>240</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>Shell</name>
<description/>
<type>SHELL</type>
<attributes/>
<filename>/home/gpadmin/kettle/python_pkgs_new/bigdata_etl_test/jobs/intelligent_test/union_yuejuan/intelligent_test_union.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>1024</xloc>
<yloc>464</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>Success</name>
<description/>
<type>SUCCESS</type>
<attributes/>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>880</xloc>
<yloc>464</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>header_teacher</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
<transname>header_teacher</transname>
<directory>/intelligent/union_yuejuan/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>Pentaho local</run_configuration>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1184</xloc>
<yloc>352</yloc>
<attributes_kjc/>
</entry>
<entry>
<name>user</name>
<description/>
<type>TRANS</type>
<attributes/>
<specification_method>rep_name</specification_method>
<trans_object_id/>
<filename/>
<transname>user</transname>
<directory>/intelligent/union_yuejuan/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>Pentaho local</run_configuration>
<parameters>
<pass_all_parameters>Y</pass_all_parameters>
</parameters>
<parallel>N</parallel>
<draw>Y</draw>
<nr>0</nr>
<xloc>1184</xloc>
<yloc>464</yloc>
<attributes_kjc/>
</entry>
</entries>
<hops>
<hop>
......@@ -1251,7 +1329,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
<from>student_info</from>
<from>student</from>
<to>bus_marking_person</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
......@@ -1314,15 +1392,6 @@
<unconditional>N</unconditional>
</hop>
<hop>
<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>dic_question_type</from>
<to>dic_select_subject</to>
<from_nr>0</from_nr>
......@@ -1360,7 +1429,7 @@
</hop>
<hop>
<from>area</from>
<to>student_info</to>
<to>student</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
......@@ -1386,7 +1455,7 @@
<unconditional>N</unconditional>
</hop>
<hop>
<from>class</from>
<from>school_class</from>
<to>dic_question_type</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
......@@ -1395,17 +1464,17 @@
<unconditional>N</unconditional>
</hop>
<hop>
<from>Shell</from>
<to>Success</to>
<from>bus_subjective_question_config</from>
<to>school_class</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>N</enabled>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>bus_subjective_question_config</from>
<to>class</to>
<from>bus_exam_school</from>
<to>tenant</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
......@@ -1413,8 +1482,35 @@
<unconditional>N</unconditional>
</hop>
<hop>
<from>bus_exam_school</from>
<to>tenant</to>
<from>bus_marking_person</from>
<to>header_teacher</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>header_teacher</from>
<to>user</to>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
<evaluation>Y</evaluation>
<unconditional>N</unconditional>
</hop>
<hop>
<from>user</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>
<from_nr>0</from_nr>
<to_nr>0</to_nr>
<enabled>Y</enabled>
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:16:40.236</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:07:27.950</modified_date>
<modified_date>2021/07/23 17:35:20.381</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>school_yuejuan_base</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>base_resource_test</database>
<database>jty_archive</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -501,6 +501,11 @@
<order>
<hop>
<from>teacher</from>
<to>字段选择</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>字段选择</from>
<to>Text file output</to>
<enabled>Y</enabled>
</hop>
......@@ -557,8 +562,8 @@
</output>
</remotesteps>
<GUI>
<xloc>368</xloc>
<yloc>96</yloc>
<xloc>400</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
......@@ -575,33 +580,17 @@
</partitioning>
<connection>school_yuejuan_base</connection>
<sql>select
id,
school_id,
job_num,
phone_num,
gender,
name,
card_num,
card_area_id,
card_detail_id,
home_address_area,
home_detail_address,
high_education,
marital_status,
nation_id,
politic_countenance,
post_id,
entry_date,
birth_day,
professional_qualificationl_id,
incumbency,
emergency_contact,
emergency_contact_phone,
user_state,
modify_time,
create_time
user_id,
job_number,
created_by,
created_time,
deleted,
modified_time,
job_status,
position_id,
station_id
from teacher
where (create_time>'${start_time}' and create_time&lt;='${end_time}') or (modify_time>'${start_time}' and modify_time&lt;='${end_time}')</sql>
where (created_time>'${start_time}' and created_time&lt;='${end_time}') or (modified_time>'${start_time}' and modified_time&lt;='${end_time}')</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
......@@ -616,8 +605,216 @@ where (create_time>'${start_time}' and create_time&lt;='${end_time}') or (modify
</output>
</remotesteps>
<GUI>
<xloc>192</xloc>
<yloc>96</yloc>
<xloc>128</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>字段选择</name>
<type>SelectValues</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<name>user_id</name>
</field>
<field>
<name>job_number</name>
</field>
<field>
<name>created_by</name>
</field>
<field>
<name>created_time</name>
</field>
<field>
<name>deleted</name>
</field>
<field>
<name>modified_time</name>
</field>
<field>
<name>job_status</name>
</field>
<field>
<name>position_id</name>
</field>
<field>
<name>station_id</name>
</field>
<select_unspecified>N</select_unspecified>
<meta>
<name>user_id</name>
<rename>user_id</rename>
<type>None</type>
<length>15</length>
<precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>job_number</name>
<rename>job_number</rename>
<type>None</type>
<length>50</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>created_by</name>
<rename>created_by</rename>
<type>None</type>
<length>15</length>
<precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>created_time</name>
<rename>created_time</rename>
<type>None</type>
<length>0</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>deleted</name>
<rename>deleted</rename>
<type>Integer</type>
<length>-2</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>modified_time</name>
<rename>modified_time</rename>
<type>None</type>
<length>0</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>job_status</name>
<rename>job_status</rename>
<type>None</type>
<length>50</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>position_id</name>
<rename>position_id</rename>
<type>None</type>
<length>9</length>
<precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>station_id</name>
<rename>station_id</rename>
<type>None</type>
<length>9</length>
<precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
</fields>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>256</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
......
......@@ -428,7 +428,7 @@
<created_user>admin</created_user>
<created_date>2021/03/03 10:45:06.232</created_date>
<modified_user>admin</modified_user>
<modified_date>2020/10/28 11:07:33.320</modified_date>
<modified_date>2021/07/23 17:35:43.921</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -436,13 +436,13 @@
</notepads>
<connection>
<name>school_yuejuan_base</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>base_resource_test</database>
<database>jty_archive</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -500,6 +500,11 @@
<order>
<hop>
<from>tenant</from>
<to>字段选择</to>
<enabled>Y</enabled>
</hop>
<hop>
<from>字段选择</from>
<to>Text file output</to>
<enabled>Y</enabled>
</hop>
......@@ -575,22 +580,19 @@
<connection>school_yuejuan_base</connection>
<sql>select
id,
tenant_name,
another_name,
open_flag,
init_flag,
open_time,
created_by,
created_time,
deleted,
modified_time,
address_id,
alias,
name,
remark,
tenant_type,
address_area_id,
address_detail,
postal_code,
state,
modify_time,
create_time,
use_type
type,
english
from tenant
where (create_time>'${start_time}' and create_time&lt;='${end_time}') or (modify_time>'${start_time}' and modify_time&lt;='${end_time}')</sql>
where (created_time>'${start_time}' and created_time&lt;='${end_time}') or (modified_time>'${start_time}' and modified_time&lt;='${end_time}')</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
......@@ -605,7 +607,275 @@ where (create_time>'${start_time}' and create_time&lt;='${end_time}') or (modify
</output>
</remotesteps>
<GUI>
<xloc>208</xloc>
<xloc>96</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>字段选择</name>
<type>SelectValues</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<fields>
<field>
<name>id</name>
</field>
<field>
<name>created_by</name>
</field>
<field>
<name>created_time</name>
</field>
<field>
<name>deleted</name>
</field>
<field>
<name>modified_time</name>
</field>
<field>
<name>address_id</name>
</field>
<field>
<name>alias</name>
</field>
<field>
<name>name</name>
</field>
<field>
<name>remark</name>
</field>
<field>
<name>state</name>
</field>
<field>
<name>type</name>
</field>
<field>
<name>english</name>
</field>
<select_unspecified>N</select_unspecified>
<meta>
<name>id</name>
<rename>id</rename>
<type>None</type>
<length>15</length>
<precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>created_by</name>
<rename>created_by</rename>
<type>None</type>
<length>15</length>
<precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>created_time</name>
<rename>created_time</rename>
<type>None</type>
<length>0</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>deleted</name>
<rename>deleted</rename>
<type>Integer</type>
<length>-2</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>modified_time</name>
<rename>modified_time</rename>
<type>None</type>
<length>0</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>address_id</name>
<rename>address_id</rename>
<type>None</type>
<length>9</length>
<precision>0</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>alias</name>
<rename>alias</rename>
<type>None</type>
<length>100</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>name</name>
<rename>name</rename>
<type>None</type>
<length>100</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>remark</name>
<rename>remark</rename>
<type>None</type>
<length>100</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>state</name>
<rename>state</rename>
<type>None</type>
<length>50</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>type</name>
<rename>type</rename>
<type>None</type>
<length>50</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
<meta>
<name>english</name>
<rename>english</rename>
<type>None</type>
<length>100</length>
<precision>-2</precision>
<conversion_mask/>
<date_format_lenient>false</date_format_lenient>
<date_format_locale/>
<date_format_timezone/>
<lenient_string_to_number>false</lenient_string_to_number>
<encoding/>
<decimal_symbol/>
<grouping_symbol/>
<currency_symbol/>
<storage_type/>
</meta>
</fields>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>224</xloc>
<yloc>128</yloc>
<draw>Y</draw>
</GUI>
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
<modified_date>2021/01/09 16:05:15.709</modified_date>
<modified_date>2021/07/23 17:51:28.946</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -573,8 +573,8 @@
id as task_id,
exam_id,
create_time as end_time,
case when (select count(*) from task_list where task_status>1)>0
then (select max(create_time) from task_list where task_status>1)
case when (select count(*) from task_list where task_status>1 and source_type=3)>0
then (select max(create_time) from task_list where task_status>1 and source_type=3)
else '2000-01-01 00:00:00' end start_time
from task_list
where task_status in (0,1) and del_flag=0 and source_type=3
......
......@@ -429,7 +429,7 @@
<created_user>admin</created_user>
<created_date>2020/01/04 14:20:10.613</created_date>
<modified_user>admin</modified_user>
<modified_date>2021/01/11 13:33:56.728</modified_date>
<modified_date>2021/07/26 13:58:10.469</modified_date>
<key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
<is_key_private>N</is_key_private>
</info>
......@@ -437,13 +437,13 @@
</notepads>
<connection>
<name>intelligent_union_yuejuan_neiwang</name>
<server>192.168.2.244</server>
<server>10.1.103.251</server>
<type>MYSQL</type>
<access>Native</access>
<database>union_yuejuan_yun</database>
<port>3306</port>
<username>dev</username>
<password>Encrypted 2be98afc80ec284a486009d41f2c3fd89</password>
<password>Encrypted 2be98afc86aa7f28ebf00a469fec3fd89</password>
<servername/>
<data_tablespace/>
<index_tablespace/>
......@@ -573,8 +573,8 @@
id as task_id,
exam_id,
create_time as end_time,
case when (select count(*) from task_list where task_status>1)>0
then (select max(create_time) from task_list where task_status>1)
case when (select count(*) from task_list where task_status>1 and source_type=3)>0
then (select max(create_time) from task_list where task_status>1 and source_type=3)
else '2000-01-01 00:00:00' end start_time
from task_list
where task_status=1 and del_flag=0 and source_type=3</sql>
......
......@@ -547,3 +547,7 @@ Save database : Modification by user
Save repository element : school_yuejuan_base : Modification by user
Save database : Modification by user
Save repository element : school_yuejuan_base : Modification by user
Save repository element : school_yuejuan_base_basic : Creation of initial version
Rename transformation : Renamed from class to school_class
Rename transformation : Renamed from class to school_class
Rename transformation : Renamed from student_info to student
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