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

intelligent/single_yuejuan/analysis/student_report/exam.ktr

+<?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
     <name>exam</name>
@@ -632,7 +633,7 @@
       </value>
       <value>
         <name>exam_type</name>
-        <rename>exam_type</rename>
+        <rename>model</rename>
         <update>N</update>
       </value>
     </lookup>
@@ -662,7 +663,7 @@
       <schema_name/>
     </partitioning>
     <connection>intelligent</connection>
-    <sql>SELECT id,exam_name,exam_time,exam_time_end,exam_model,grade_id,grade_name,exam_type FROM single_yuejuan_source_process.bus_exam WHERE id=${exam_id}</sql>
+    <sql>SELECT a.id,a.exam_name,a.exam_time,a.exam_time_end,a.exam_model,a.grade_id,a.grade_name,a.exam_type,a.model FROM single_yuejuan_source_process.bus_exam as a left join single_yuejuan_source_process.task_list as b on a.id=b.exam_id WHERE b.del_flag=0 and a.id=${exam_id}</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>

intelligent/single_yuejuan/analysis/student_report/subject_report.ktr

+<?xml version="1.0" encoding="UTF-8"?>
 <transformation>
   <info>
     <name>subject_report</name>
@@ -637,6 +638,11 @@
         <rename>subject_name</rename>
         <update>N</update>
       </value>
+      <value>
+        <name>order_num</name>
+        <rename>order_num</rename>
+        <update>N</update>
+      </value>
     </lookup>
     <attributes/>
     <cluster_schema/>
@@ -664,7 +670,7 @@
       <schema_name/>
     </partitioning>
     <connection>intelligent</connection>
-    <sql>SELECT a.exam_id,a.student_id,a.subject_id,b.subject_name,a.source_score,a.score FROM single_yuejuan_fundamental.fundamental_subject_score_rank as a left join single_yuejuan_source_process.bus_exam_subject as b on a.subject_id=b.id WHERE subject_type_code=0 and exam_id=${exam_id}</sql>
+    <sql>SELECT a.exam_id,a.student_id,a.subject_id,b.subject_name,b.order_num,a.source_score,a.score FROM single_yuejuan_fundamental.fundamental_subject_score_rank as a left join single_yuejuan_source_process.bus_exam_subject as b on a.subject_id=b.id WHERE subject_type_code=0 and exam_id=${exam_id}</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>

intelligent/union_yuejuan/analysis/student_report/exam.ktr

@@ -633,7 +633,7 @@
       </value>
       <value>
         <name>exam_type</name>
-        <rename>exam_type</rename>
+        <rename>model</rename>
         <update>N</update>
       </value>
     </lookup>
@@ -663,7 +663,7 @@
       <schema_name/>
     </partitioning>
     <connection>intelligent</connection>
-    <sql>SELECT id,exam_name,exam_time,exam_time_end,exam_model,grade_id,grade_name,exam_type FROM union_yuejuan_source_process.bus_exam WHERE id=${exam_id}</sql>
+    <sql>SELECT a.id,a.exam_name,a.exam_time,a.exam_time_end,a.exam_model,a.grade_id,a.grade_name,a.exam_type,b.model FROM union_yuejuan_source_process.bus_exam as a left join union_yuejuan_source_process.task_list as b on a.id=b.exam_id  WHERE b.del_flag=0 and a.id=${exam_id}</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>

intelligent/union_yuejuan/analysis/student_report/subject_report.ktr

@@ -638,6 +638,11 @@
         <rename>subject_name</rename>
         <update>N</update>
       </value>
+      <value>
+        <name>order_num</name>
+        <rename>order_num</rename>
+        <update>N</update>
+      </value>
     </lookup>
     <attributes/>
     <cluster_schema/>
@@ -665,7 +670,7 @@
       <schema_name/>
     </partitioning>
     <connection>intelligent</connection>
-    <sql>SELECT a.exam_id,a.student_id,a.subject_id,b.subject_name,a.source_score,a.score FROM union_yuejuan_fundamental.fundamental_subject_score_rank as a left join union_yuejuan_source_process.bus_exam_subject as b on a.subject_id=b.id WHERE  exam_id=${exam_id}</sql>
+    <sql>SELECT a.exam_id,a.student_id,a.subject_id,b.subject_name,b.order_num,a.source_score,a.score FROM union_yuejuan_fundamental.fundamental_subject_score_rank as a left join union_yuejuan_source_process.bus_exam_subject as b on a.subject_id=b.id WHERE  exam_id=${exam_id}</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>