git代码与正式代码差异补充

src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_workflow.lwm

@@ -19,7 +19,7 @@
         <bm:field name="show_approve_history_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SHOW_APPROVE_HISTORY_FLAG" prompt="ZJ_WFL_WORKFLOW.SHOW_APPROVE_HISTORY_FLAG"/>
         <bm:field name="show_all_approve_ht_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SHOW_ALL_APPROVE_HT_FLAG" prompt="ZJ_WFL_WORKFLOW.SHOW_ALL_APPROVE_HT_FLAG"/>
         <bm:field name="serial_number" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SERIAL_NUMBER" prompt="序号"/>
-        <bm:field name="is_archive" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IS_ARCHIVE" />
+		 <bm:field name="is_archive" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IS_ARCHIVE" />
         <bm:field name="is_archive_desc" forInsert="false" forUpdate="false"/>
         <bm:field name="archive_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ARCHIVE_TYPE" />
         <bm:field name="archive_type_desc" forInsert="false" forUpdate="false"/>
@@ -45,11 +45,11 @@
 				       t1.display_service_name,
 				       t1.show_approve_history_flag,
 				       t1.show_all_approve_ht_flag,
-				       t1.serial_number,
-				       t1.is_archive,
-                      t1.archive_type,
-                      t1.is_archive_desc,
-                      t1.archive_type_desc
+					    t1.is_archive,
+				       t1.archive_type,
+                       t1.is_archive_desc,
+                       t1.archive_type_desc,
+				       t1.serial_number
 				  from zj_wfl_workflow_v t1
 				  #WHERE_CLAUSE#
 				  order by t1.serial_number,t1.workflow_type_code,t1.workflow_code
@@ -60,7 +60,7 @@
             begin
 				zj_wfl_workflow_pkg.delete_wfl_workflow
 				(
-					p_workflow_id        	  => ${@workflow_id},					
+					p_workflow_id        	  => ${@workflow_id},
 					p_user_id                 => ${/session/@user_id}
 				);
 			end;
@@ -84,11 +84,11 @@
 										                 p_display_service_id			=> ${@display_service_id},
 										                 p_show_approve_history_flag	=> ${@show_approve_history_flag},
 										                 p_show_all_approve_ht_flag		=> ${@show_all_approve_ht_flag},
-										                 p_serial_number				=> ${@serial_number},
-                                                         p_is_archive                   => ${@is_archive},
+														  p_is_archive                   => ${@is_archive},
                                                          p_archive_type                 => ${@archive_type},
-                                                         p_user_id          			=> ${/session/@user_id});
-			
+										                 p_serial_number				=> ${@serial_number},
+										                 p_user_id          			=> ${/session/@user_id});
+
 				end;
 			]]></bm:update-sql>
         </bm:operation>
@@ -107,11 +107,11 @@
 										                 p_display_service_id			=> ${@display_service_id},
 										                 p_show_approve_history_flag	=> ${@show_approve_history_flag},
 										                 p_show_all_approve_ht_flag		=> ${@show_all_approve_ht_flag},
-										                 p_serial_number				=> ${@serial_number},
-                                                         p_is_archive                   => ${@is_archive},
+														  p_is_archive                   => ${@is_archive},
                                                          p_archive_type                 => ${@archive_type},
-                                                        p_user_id          			=> ${/session/@user_id});
-			
+										                 p_serial_number				=> ${@serial_number},
+										                 p_user_id          			=> ${/session/@user_id});
+
 				end;
 			]]></bm:update-sql>
         </bm:operation>
@@ -123,6 +123,8 @@
         <bm:query-field field="workflow_desc" queryOperator="like"/>
         <bm:query-field field="sub_category" queryOperator="="/>
         <bm:query-field field="enabled_flag" queryOperator="="/>
+		<bm:query-field field="is_archive_desc" queryOperator="="/>
+        <bm:query-field field="archive_type_desc" queryOperator="="/>
     </bm:query-fields>
     <!-- <bm:data-filters>
         <bm:data-filter enforceOperations="query" expression="exists             (select 1 from  zj_wfl_workflow_node t,zj_wfl_workflow_assign_rule r,exp_emp_assign_e_v ex where t.workflow_id=t1.WORKFLOW_ID            and r.assign_source_id=t.node_id and r.company_id=${/session/@company_id} and r.approval_rule=&apos;APPOINTED_COM_POS&apos;         and ex.user_id=${/session/@user_id} )"/>