电子档案流程及功能版式文件调整

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_data_confirm.lwm

@@ -15,15 +15,30 @@
         </bm:operation>
         <bm:operation name="execute">
             <bm:update-sql><![CDATA[
+            declare
+            v_transaction_num  varchar2(100)
             begin
                 if ${@flag} = 'SUBMIT' then
                     update CSH_TRANSACTION
                     set confirmed_flag = 'WF_APPROVING'
                     where transaction_id = ${@transaction_id};
                 elsif ${@flag} = 'RETURN' then
+                 select ct.transaction_num
+                      into v_transaction_num
+                      from csh_transaction ct where ct.transaction_id=${@transaction_id};
+
                     update CSH_TRANSACTION
                     set confirmed_flag = 'WF_REJECTED'
                     where transaction_id = ${@transaction_id};
+
+                     elec_wfl_pkg.func_archives_post_list(p_document_id => ${@transaction_id},
+                                                               p_archive_type=>'COLLECTION_RELATED_PROC',--收款相关
+                                                               p_document_number=>v_transaction_num,
+                                                               p_user_id        => p_user_id,
+                                                               p_status=>-1,
+                                                               p_instance_desc=>v_transaction_num||'-核销确认'
+                                                               );
+
                 end if;
             end;
             ]]></bm:update-sql>

src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/wfl_instance_pdf.lwm

@@ -30,7 +30,7 @@
                     faa.file_name,
                     faa.file_path,
                     faa.file_type_code,
-                    '建机审批流版式文件-'||z.workflow_desc||'-'||z.instance_id||'.docx'   to_file_name,
+                    '建机审批流版式文件-' ||decode(z.workflow_id,-1,substr(z.instance_desc,instr(z.instance_desc,'-',1)+1),(select w.workflow_desc from zj_wfl_workflow w where w.workflow_id=z.workflow_id)) || '-' || z.instance_id || '.docx' to_file_name,
                     lt.pwd,
                     fc.document_id,
                     fc.content_id
@@ -40,7 +40,7 @@
                     hls_doc_file_templet lt,
                     con_clause_templet t,
                     hls_doc_file_content fc,
-                    zj_wfl_workflow_instance_v z
+                    zj_wfl_workflow_instance z
                 WHERE
                     faa.attachment_id = m.attachment_id AND
                     m.table_name      = 'HLS_DOC_FILE_TEMPLET' AND