电子档案非功能性取值逻辑增加

src/main/webapp/WEB-INF/classes/efile/EFILE1010/elec_file_type.lwm

@@ -24,7 +24,9 @@
         <bm:field name="post_stru_data_flag_desc"  forInsert="false" expression="(SELECT c.code_value_name FROM sys_code_values_v c where c.code=&apos;YES_NO&apos; and c.code_value = t1.post_stru_data_flag)" forUpdate="false"/>
         <bm:field name="post_atm_flag_desc"  forInsert="false" expression="(SELECT c.code_value_name FROM sys_code_values_v c where c.code=&apos;YES_NO&apos; and c.code_value = t1.post_atm_flag)" forUpdate="false" />
         <bm:field name="je_check_flag_desc"  forInsert="false" expression="(SELECT c.code_value_name FROM sys_code_values_v c where c.code=&apos;YES_NO&apos; and c.code_value = t1.je_check_flag)" forUpdate="false"/>
-    </bm:fields>
+        <bm:field name="func_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="FUNC_TYPE" />
+        <bm:field name="func_type_desc"  forInsert="false" expression="(SELECT c.code_value_name FROM sys_code_values_v c where c.code=&apos;EFILE_FUNC_DESCRIP&apos; and c.code_value = t1.func_type)" forUpdate="false" />
+  </bm:fields>
     <bm:operations>
         <bm:operation name="insert">
             <bm:update-sql><![CDATA[
@@ -38,6 +40,7 @@
                                                 p_stru_data_sql       => ${@stru_data_sql},
                                                 p_is_workflow         => ${@is_workflow},
                                                 p_workflow_id        => ${@workflow_id},
+                                                p_func_type         => ${@func_type},
                                                 p_post_atm_flag       => ${@post_atm_flag},
                                                 p_atm_sql             => ${@atm_sql},
                                                 p_je_check_flag       => ${@je_check_flag},
@@ -58,6 +61,7 @@
                                                 p_post_stru_data_flag => ${@post_stru_data_flag},
                                                 p_stru_data_sql       => ${@stru_data_sql},
                                                 p_is_workflow         => ${@is_workflow},
+                                                p_func_type         => ${@func_type},
                                                 p_workflow_id         => ${@workflow_id},
                                                 p_post_atm_flag       => ${@post_atm_flag},
                                                 p_atm_sql             => ${@atm_sql},

src/main/webapp/WEB-INF/classes/efile/EFILE1020/archives_post_list.lwm

@@ -15,8 +15,13 @@
               t.archive_type,
                      (select v.code_value_name value_name
                         from sys_code_values_v v
-                       where v.code = 'ELEC_FILE_TYPE'
+                       where v.code = 'DATA_CLASSIFICATION'
                          and v.code_value = t.archive_type) archive_type_desc,
+              t.func_type,
+           (select v.code_value_name value_name
+              from sys_code_values_v v
+             where v.code = 'EFILE_FUNC_DESCRIP'
+               and v.code_value = t.archive_type) func_type_desc,
               t.document_id,
               t.document_number,
               t.document_info,

src/main/webapp/WEB-INF/classes/efile/EFILE1020/efile_generated_selected.lwm

@@ -13,6 +13,7 @@
 					 elec_wfl_pkg.efile_generate_pool(p_e_archives_id					=> ${@e_archives_id},
 													p_base_archive_code					=> ${@base_archive_code},
 													p_archive_type         				=> ${@archive_type},
+													p_func_type        				    => ${@func_type},
 						                            p_document_id       				=> ${@document_id},
 						                            p_document_number                  => ${@document_number},
 						                            p_document_info                    => ${@document_info},

src/main/webapp/modules/efile/EFILE1000/efile_get_token.lsc

@@ -49,7 +49,7 @@
                     }
 
                     if (status) {
-                        var token_savelogs_bm = $bm('efile.EFILE1000.token_savelogs');
+                        var token_savelogs_bm = $bm('efile.EFILE1000.efile_get_token');
                         token_savelogs_bm.insert({
                             'json': json,
                             'status': 'fail'

src/main/webapp/modules/efile/EFILE1010/elec_type_define.lview

@@ -132,11 +132,12 @@
             <a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
             <a:dataSet id="underline_ds" lookupCode="UNDERLINE"/>
             <a:dataSet id="data_cf_ds" lookupCode="DATA_CLASSIFICATION"/>
+            <a:dataSet id="efile_func_descrip" lookupCode="EFILE_FUNC_DESCRIP"/>
             <a:dataSet id="for_query_ds" autoCreate="true">
                 <a:fields>
                     <a:field name="archive_type" />
                     <a:field name="is_workflow" />
-                    <a:field name="post_atm_flag" />
+                     <a:field name="post_atm_flag" />
                     <a:field name="je_check_flag" />
                     <a:field name="archive_type_desc" displayField="code_value_name" options="data_cf_ds"  returnField="archive_type" valueField="code_value"/>
                     <a:field name="is_workflow_desc" displayField="code_value_name" options="yes_no_ds"  returnField="is_workflow" valueField="code_value"/>
@@ -148,6 +149,7 @@
                 <a:fields>
                     <a:field name="archive_type_desc" displayField="code_value_name" options="data_cf_ds"  returnField="archive_type" valueField="code_value"/>
                     <a:field name="is_workflow_desc" displayField="code_value_name" options="yes_no_ds"  returnField="is_workflow" valueField="code_value"/>
+                    <a:field name="func_type_desc" displayField="code_value_name" options="efile_func_descrip"  returnField="func_type" valueField="code_value"/>
                     <a:field name="post_stru_data_flag_desc" displayField="code_value_name" options="yes_no_ds"  returnField="post_stru_data_flag" valueField="code_value"/>
                     <a:field name="post_atm_flag_desc" displayField="code_value_name" options="yes_no_ds"  returnField="post_atm_flag" valueField="code_value"/>
                     <a:field name="je_check_flag_desc" displayField="code_value_name" options="yes_no_ds"  returnField="je_check_flag" valueField="code_value"/>
@@ -155,6 +157,7 @@
                     <a:field name="cloumn_name" />
                     <a:field name="workflow_code" />
                     <a:field name="workflow_id" />
+                    <a:field name="func_type" />
                     <a:field name="workflow_desc" lovGridHeight="300" lovHeight="450" lovService="efile.EFILE1010.zj_wfl_workflow_lov" lovWidth="550" title="工作流类型">
                         <a:mapping>
                             <a:map from="workflow_id" to="workflow_id"/>
@@ -217,6 +220,7 @@
                     <a:column name="archive_type_desc" editor="efile_type_comed" prompt="资料分类" width="120"/>
                     <a:column name="is_workflow_desc" editor="efile_type_comed" prompt="是否关联工作流" width="120"/>
                     <a:column name="workflow_desc" editor="conBasicClauseParaDs_grid_lov" prompt="工作流描述" width="130"/>
+                    <a:column name="func_type_desc" editor="efile_type_comed" prompt="功能名称" width="120"/>
                     <a:column name="post_stru_data_flag_desc" editor="efile_type_comed" prompt="是否传递结构化数据" width="150"/>
                     <a:column name="cloumn_name" align="center" prompt="结构化字段" renderer="hls_doc_table_list_renderer"/>
                     <a:column name="stru_data_sql" align="center" editor="conBasicClauseParaDs_grid_lov" width="300" prompt="结构化数据取值sql"/>

src/main/webapp/modules/efile/EFILE1020/archives_post_list.lview

@@ -53,7 +53,7 @@
 
    ]]></script>
         <a:dataSets>
-            <a:dataSet id="archive_type_ds" lookupCode="ELEC_FILE_TYPE"/>
+            <a:dataSet id="archive_type_ds" lookupCode="DATA_CLASSIFICATION"/>
             <a:dataSet id="done_flag_ds" lookupCode="DONE_FLAG_STATUS"/>
             <a:dataSet id="archives_post_list_query" autoCreate="true">
                 <a:fields>