I-21941【建机】系统合同结束工作流优化文件下载调整

src/main/webapp/WEB-INF/classes/cont/CON301N/con_contract_file_templet_get_atm.lwm

@@ -21,14 +21,15 @@
                       WHERE c.bp_id_tenant = hbm.bp_id
                       and c.contract_id = cc.document_id) bp_id_tenant_n,
                     '所有权转移通知书(' ||
-                    (SELECT c.contract_number
-                       FROM con_contract c
-                      WHERE c.contract_id = cc.document_id) || '_' ||
                     (SELECT hbm.bp_name
-                       FROM con_contract c,hls_bp_master hbm
-                      WHERE c.bp_id_tenant = hbm.bp_id
-                      and c.contract_id = cc.document_id) || ')' down_file_name,
-                    faa.file_name to_file_name,
+                   FROM con_contract c,hls_bp_master hbm
+                  WHERE c.bp_id_tenant = hbm.bp_id
+                  and c.contract_id = cc.document_id)
+                  || '_' ||
+                 (SELECT c.contract_number
+                    FROM con_contract c
+                   WHERE c.contract_id = cc.document_id)|| ')' down_file_name,
+                     faa.file_name to_file_name,
                     (SELECT 'Y'
                        FROM fnd_atm_attachment_multi m1
                       WHERE m1.table_name = 'HLS_DOC_FILE_CONTENT'

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query_wfl.lwm

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    $Author: Feng  
-    $Date: 2013-9-27 上午10:27:56  
-    $Revision: 1.0  
-    $Purpose: 
+    $Author: Feng
+    $Date: 2013-9-27 上午10:27:56
+    $Revision: 1.0
+    $Purpose:
 -->
 <bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CON_CONTRACT_V" defaultOrderBy="lease_end_date desc" needAccessControl="false">
     <bm:fields>
@@ -48,8 +48,8 @@
         <bm:field name="is_sbo_zero" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IS_SBO_ZERO" prompt="CON_CONTRACT.IS_SBO_ZERO"/>
         <bm:field name="is_sbo_zero_desc"/>
         <bm:field name="sum_unreceived_penalty"/>
-        <bm:field name="breach_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BREACH_TYPE" prompt="CON_CONTRACT.BREACH_TYPE"/>
-        <bm:field name="breach_type_desc"/>
+       <bm:field name="breach_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BREACH_TYPE" prompt="违约金减免原因"/>
+        <bm:field name="breach_type_desc" prompt="违约金减免原因"/>
         <bm:field name="backgroud_description"/>
     </bm:fields>
     <bm:features>