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

intelligent/single_yuejuan/analysis/student_report/student_report.kjb

+<?xml version="1.0" encoding="UTF-8"?>
 <job>
   <name>student_report</name>
   <description/>
   <extended_description/>
   <job_version/>
-  <directory>/analysis/student_report</directory>
+  <directory>/</directory>
   <created_user>-</created_user>
   <created_date>2021/11/01 13:08:53.076</created_date>
   <modified_user>-</modified_user>
@@ -321,7 +322,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>288</xloc>
+      <xloc>368</xloc>
       <yloc>272</yloc>
       <attributes_kjc/>
     </entry>
@@ -361,7 +362,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>416</xloc>
+      <xloc>464</xloc>
       <yloc>272</yloc>
       <attributes_kjc/>
     </entry>
@@ -479,6 +480,45 @@
       <yloc>272</yloc>
       <attributes_kjc/>
     </entry>
+    <entry>
+      <name>roll_back</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>/intelligent/single_yuejuan/analysis/student_report/roll_back</filename>
+      <transname/>
+      <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>
+      <suppress_result_data>N</suppress_result_data>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>272</xloc>
+      <yloc>272</yloc>
+      <attributes_kjc/>
+    </entry>
   </entries>
   <hops>
     <hop>
@@ -509,8 +549,17 @@
       <unconditional>N</unconditional>
     </hop>
     <hop>
+      <from>total_report</from>
+      <to>成功</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
       <from>Start</from>
-      <to>exam</to>
+      <to>roll_back</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -518,8 +567,8 @@
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>total_report</from>
-      <to>成功</to>
+      <from>roll_back</from>
+      <to>exam</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>

intelligent/union_yuejuan/analysis/student_report/student_report.kjb

@@ -321,7 +321,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>288</xloc>
+      <xloc>368</xloc>
       <yloc>272</yloc>
       <attributes_kjc/>
     </entry>
@@ -360,7 +360,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>416</xloc>
+      <xloc>464</xloc>
       <yloc>272</yloc>
       <attributes_kjc/>
     </entry>
@@ -476,6 +476,45 @@
       <yloc>272</yloc>
       <attributes_kjc/>
     </entry>
+    <entry>
+      <name>roll_back</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>/intelligent/union_yuejuan/analysis/student_report/roll_back</filename>
+      <transname/>
+      <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>
+      <suppress_result_data>N</suppress_result_data>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>272</xloc>
+      <yloc>272</yloc>
+      <attributes_kjc/>
+    </entry>
   </entries>
   <hops>
     <hop>
@@ -506,8 +545,17 @@
       <unconditional>N</unconditional>
     </hop>
     <hop>
+      <from>total_report</from>
+      <to>成功</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
       <from>Start</from>
-      <to>exam</to>
+      <to>roll_back</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -515,8 +563,8 @@
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>total_report</from>
-      <to>成功</to>
+      <from>roll_back</from>
+      <to>exam</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>