Commit 7d77b3af by luofeng

fix:学科排序及新高考字段区分

parent 559f9a13
...@@ -604,37 +604,37 @@ ...@@ -604,37 +604,37 @@
<value> <value>
<name>exam_name</name> <name>exam_name</name>
<rename>exam_name</rename> <rename>exam_name</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_time</name> <name>exam_time</name>
<rename>exam_time</rename> <rename>exam_time</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_time_end</name> <name>exam_time_end</name>
<rename>exam_time_end</rename> <rename>exam_time_end</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_model</name> <name>exam_model</name>
<rename>exam_model</rename> <rename>exam_model</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>grade_id</name> <name>grade_id</name>
<rename>grade_id</rename> <rename>grade_id</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>grade_name</name> <name>grade_name</name>
<rename>grade_name</rename> <rename>grade_name</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_type</name> <name>exam_type</name>
<rename>model</rename> <rename>model</rename>
<update>N</update> <update>Y</update>
</value> </value>
</lookup> </lookup>
<attributes/> <attributes/>
......
...@@ -626,22 +626,22 @@ ...@@ -626,22 +626,22 @@
<value> <value>
<name>source_score</name> <name>source_score</name>
<rename>source_score</rename> <rename>source_score</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>score</name> <name>score</name>
<rename>score</rename> <rename>score</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>subject_name</name> <name>subject_name</name>
<rename>subject_name</rename> <rename>subject_name</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>order_num</name> <name>order_num</name>
<rename>order_num</rename> <rename>order_num</rename>
<update>N</update> <update>Y</update>
</value> </value>
</lookup> </lookup>
<attributes/> <attributes/>
......
<?xml version="1.0" encoding="UTF-8"?>
<transformation> <transformation>
<info> <info>
<name>total_report</name> <name>total_report</name>
...@@ -5,7 +6,7 @@ ...@@ -5,7 +6,7 @@
<extended_description/> <extended_description/>
<trans_version/> <trans_version/>
<trans_type>Normal</trans_type> <trans_type>Normal</trans_type>
<directory>/analysis/student_report</directory> <directory>/</directory>
<parameters> <parameters>
</parameters> </parameters>
<log> <log>
...@@ -429,7 +430,7 @@ ...@@ -429,7 +430,7 @@
<created_date>2021/11/01 13:53:57.534</created_date> <created_date>2021/11/01 13:53:57.534</created_date>
<modified_user>-</modified_user> <modified_user>-</modified_user>
<modified_date>2021/11/01 13:57:48.161</modified_date> <modified_date>2021/11/01 13:57:48.161</modified_date>
<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>
<notepads> <notepads>
...@@ -499,6 +500,10 @@ ...@@ -499,6 +500,10 @@
<index_tablespace/> <index_tablespace/>
<attributes> <attributes>
<attribute> <attribute>
<code>EXTRA_OPTION_MYSQL.characterEncoding</code>
<attribute>utf-8</attribute>
</attribute>
<attribute>
<code>EXTRA_OPTION_MYSQL.defaultFetchSize</code> <code>EXTRA_OPTION_MYSQL.defaultFetchSize</code>
<attribute>500</attribute> <attribute>500</attribute>
</attribute> </attribute>
...@@ -556,39 +561,6 @@ ...@@ -556,39 +561,6 @@
</hop> </hop>
</order> </order>
<step> <step>
<name>表输入</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>intelligent</connection>
<sql>SELECT exam_id,student_id,source_score,score FROM single_yuejuan_fundamental.fundamental_total_score_rank WHERE subject_type_code=0 and exam_id=${exam_id}</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>240</xloc>
<yloc>352</yloc>
<draw>Y</draw>
</GUI>
</step>
<step>
<name>插入 / 更新</name> <name>插入 / 更新</name>
<type>InsertUpdate</type> <type>InsertUpdate</type>
<description/> <description/>
...@@ -630,12 +602,12 @@ ...@@ -630,12 +602,12 @@
<value> <value>
<name>source_score</name> <name>source_score</name>
<rename>source_score</rename> <rename>source_score</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>score</name> <name>score</name>
<rename>score</rename> <rename>score</rename>
<update>N</update> <update>Y</update>
</value> </value>
</lookup> </lookup>
<attributes/> <attributes/>
...@@ -652,6 +624,40 @@ ...@@ -652,6 +624,40 @@
<draw>Y</draw> <draw>Y</draw>
</GUI> </GUI>
</step> </step>
<step>
<name>表输入</name>
<type>TableInput</type>
<description/>
<distribute>Y</distribute>
<custom_distribution/>
<copies>1</copies>
<partitioning>
<method>none</method>
<schema_name/>
</partitioning>
<connection>intelligent</connection>
<sql>SELECT exam_id,student_id,source_score,score FROM single_yuejuan_fundamental.fundamental_total_score_rank WHERE subject_type_code=0 and exam_id=${exam_id}</sql>
<limit>0</limit>
<lookup/>
<execute_each_row>N</execute_each_row>
<variables_active>Y</variables_active>
<lazy_conversion_active>N</lazy_conversion_active>
<cached_row_meta_active>N</cached_row_meta_active>
<row-meta/>
<attributes/>
<cluster_schema/>
<remotesteps>
<input>
</input>
<output>
</output>
</remotesteps>
<GUI>
<xloc>240</xloc>
<yloc>352</yloc>
<draw>Y</draw>
</GUI>
</step>
<step_error_handling> <step_error_handling>
</step_error_handling> </step_error_handling>
<slave-step-copy-partition-distribution> <slave-step-copy-partition-distribution>
......
...@@ -604,37 +604,37 @@ ...@@ -604,37 +604,37 @@
<value> <value>
<name>exam_name</name> <name>exam_name</name>
<rename>exam_name</rename> <rename>exam_name</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_time</name> <name>exam_time</name>
<rename>exam_time</rename> <rename>exam_time</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_time_end</name> <name>exam_time_end</name>
<rename>exam_time_end</rename> <rename>exam_time_end</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_model</name> <name>exam_model</name>
<rename>exam_model</rename> <rename>exam_model</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>grade_id</name> <name>grade_id</name>
<rename>grade_id</rename> <rename>grade_id</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>grade_name</name> <name>grade_name</name>
<rename>grade_name</rename> <rename>grade_name</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>exam_type</name> <name>exam_type</name>
<rename>model</rename> <rename>model</rename>
<update>N</update> <update>Y</update>
</value> </value>
</lookup> </lookup>
<attributes/> <attributes/>
......
...@@ -626,22 +626,22 @@ ...@@ -626,22 +626,22 @@
<value> <value>
<name>source_score</name> <name>source_score</name>
<rename>source_score</rename> <rename>source_score</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>score</name> <name>score</name>
<rename>score</rename> <rename>score</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>subject_name</name> <name>subject_name</name>
<rename>subject_name</rename> <rename>subject_name</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>order_num</name> <name>order_num</name>
<rename>order_num</rename> <rename>order_num</rename>
<update>N</update> <update>Y</update>
</value> </value>
</lookup> </lookup>
<attributes/> <attributes/>
......
...@@ -602,12 +602,12 @@ ...@@ -602,12 +602,12 @@
<value> <value>
<name>source_score</name> <name>source_score</name>
<rename>source_score</rename> <rename>source_score</rename>
<update>N</update> <update>Y</update>
</value> </value>
<value> <value>
<name>score</name> <name>score</name>
<rename>score</rename> <rename>score</rename>
<update>N</update> <update>Y</update>
</value> </value>
</lookup> </lookup>
<attributes/> <attributes/>
......
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