Merge branch 'feature/金税功能去除空格' into develop

# Conflicts:
#	src/main/resources/profiles/dev/config.properties
#	src/main/webapp/WEB-INF/uncertain.local.xml

.gitignore

@@ -25,6 +25,8 @@ overlays/
 # common config rename
 uncertain.local.xml
 config.properties
+pom.xml
 
 atm_upload.svc
 atm_upload_unUseSubFolder.svc
+!/src/main/webapp/WEB-INF/uncertain.local.xml

src/main/resources/config.properties

@@ -122,6 +122,8 @@ hls.interface.log=/u01/logs
 #Leaf frame version
 leaf.version=1.0
 
+
+
 leaf.logDebuggerModel=true
 
 session.filter.excludePattern=

src/main/resources/profiles/dev/config.properties

@@ -10,7 +10,7 @@ redis.useSentinel=false
 
 redis.ip=localhost
 redis.port=6379
-redis.db=2
+redis.db=10
 
 #db.jndiName=java:comp/env/jdbc/hap_dev
 
@@ -119,14 +119,17 @@ icbc.submitUrl=
 #Generic log storage address
 hls.interface.log=/u01/logs
 
-
 #Leaf frame version
 leaf.version=1.0
 
 
-# session.filter.excludePattern=
-
-layout.gridButtonIgnoreReadModel=true
+leaf.logDebuggerModel=true
 
+session.filter.excludePattern=
 
-leaf.logDebuggerModel=true
+#layout config
\ No newline at end of file
+layout.gridButtonIgnoreReadModel=false
+#emay dev
+emay.appId=EUCP-EMY-SMS0-JBZOQ
+emay.secretKey=3E6BA3366DCF8959
+emay.host=bjmtn.b2m.cn:80

src/main/webapp/WEB-INF/classes/acr/ACR515/acr_invoice_interface_ln.lwm

@@ -2,7 +2,52 @@
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">
-            <bm:query-sql><![CDATA[select *
+            <bm:query-sql><![CDATA[select
+   l.invoice_hd_id,
+   l.bp_code,
+   l.description,
+   l.vat_red_notice_num,
+   l.ref_vat_invoice_code,
+   l.ref_invoice_number,
+   l.created_by_name，
+   l.confirmed_by_name,
+   l.received_by_name,
+   l.invoice_kind_n,
+   l.invoice_title,
+   l.invoice_bp_address_phone_num,
+   l.document_number,
+   l.invoice_date,
+   l.invoice_number,
+   l.bp_name,
+   l.bp_tax_registry_num,
+   l.bp_address_phone_num,
+   replace(l.bp_bank_account,' ','')bp_bank_account,
+   l.product_name,
+   l.product_code,
+   l.specification,
+   l.uom,
+   l.quantity,
+   l.price,
+   l.tax_type_rate,
+   l.tax_amount,
+   l.total_amount,
+   l.discount_amount,
+   l.dicount_tax_amount,
+   l.discount_rate,
+   l.rec_man,
+   l.rec_man_tax_num,
+   l.del_man,
+   l.del_man_tax_num,
+   l.place_of_sending,
+   l.car_type_num,
+   l.car_ship_tonnage,
+   l.product_info,
+   l.code_version,
+   l.tax_type_code,
+   l.preferential_policy_flag,
+   l.preferential_policy_content,
+   l.zero_tax_rate_flag,
+   l.reduce_amount
   from acr_invoice_interface_lv l
  where l.invoice_hd_id in
        (select t.invoice_hd_id

src/main/webapp/WEB-INF/classes/cont/CON3500/contract_ifrs9_sum_report.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+            select * from ( select cfr.bp_code,max(cfr.max_overdue_days)max_overdue_days from con_contract_ifrs9 cfr where cfr.period_day=${@period_name} and cfr.max_overdue_days>0 group by cfr.bp_code)v
+                #WHERE_CLAUSE#
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/cont/CON_ET003/con_early_termination_modify_query.lwm

@@ -156,7 +156,8 @@
                             )req_status_n,
                             r.created_by,
                             (SELECT su.description FROM sys_user su WHERE su.user_id=r.created_by)req_employee_n,
-                              to_char(r.termination_date,'yyyy-mm-dd')termination_date
+                              to_char(r.termination_date,'yyyy-mm-dd')termination_date,
+                              r.simulation_flag
                             FROM
                             con_contract t,
                             hls_bp_master b,
@@ -167,6 +168,7 @@
                             r.et_flag='Y' AND
                             t.bp_id_tenant      = b.bp_id(+) AND
                             dt.document_type(+) = t.document_type
+                            and nvl(r.simulation_flag,'N')='N'
                             order by r.change_req_number
 
                         ) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_deposit_sum_report_query.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+            select * from ( select v1.contract_id,
+            (select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number,
+       v1.unwrite_off_amount
+
+  from (select tt.ref_contract_id contract_id,
+               sum((nvl(tt.transaction_amount, 0) -
+                   nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount
+          from csh_transaction tt
+         where tt.transaction_type = 'DEPOSIT'
+           and tt.ref_contract_id is not null
+           and tt.transaction_amount > 0
+           and tt.source_type is not null
+           and tt.transaction_date <= to_date(${@calc_date},'yyyy-mm-dd')
+           and tt.deposit_trans_type ='rent_deposit'
+           and tt.source_type is not null
+           and tt.company_id=${/session/@company_id}
+           and (exists (
+                (select 1
+                from exp_emp_assign_e_v ee
+               where ee.user_id = ${/session/@user_id}
+                  and ee.unit_id not in (1565,1552,1564,1551,1559,1547,1560,1545,1546,1568,1566,1570,1550,1569,1555,1571,1558)
+                  and ee.unit_id=(SELECT h.unit_id FROM hls_bp_master h WHERE h.bp_id=tt.bp_id)
+                  and ${/session/@role_id} in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ) )
+                  or (${/session/@role_id} not in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ))
+            and ((decode(${/session/@user_id}, 10600, 1, 2) = 1
+                                                   and exists (select 1 from hls_bp_master hb where hb.bp_id = tt.bp_id
+                                                   and hb.bp_code in  ('D00000028','D00000035','D00000016','D00000021','D00000039','D00000025','D00000034','D00000017','D00000018','D00000024','D00000032','D00000009','D00000012','D00000014','D00000015','D00000023')) )
+                                                   or (decode(${/session/@user_id}, 10600, 1, 2) = 2))
+          and ((nvl(tt.transaction_amount, 0) - nvl(tt.write_off_amount, 0) -
+       nvl(tt.returned_amount, 0)) > 0)
+         group by tt.ref_contract_id) v1
+         )v
+                #WHERE_CLAUSE#
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+<!--    <bm:data-filters>-->
+<!--        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>-->
+<!--        &lt;!&ndash;<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>&ndash;&gt;-->
+<!--        <bm:data-filter name="query" expression="(t1.ref_contract_id is not null)"/>-->
+<!--        <bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/>-->
+<!--        <bm:data-filter name="query" expression="(t1.source_type is not null)"/>-->
+<!--        <bm:data-filter name="query" expression="(exists (-->
+<!--                (select 1-->
+<!--                from exp_emp_assign_e_v ee-->
+<!--               where ee.user_id = ${/session/@user_id}-->
+<!--                  and ee.unit_id not in (1565,1552,1564,1551,1559,1547,1560,1545,1546,1568,1566,1570,1550,1569,1555,1571,1558)-->
+<!--                  and ee.unit_id=(SELECT h.unit_id FROM hls_bp_master h WHERE h.bp_id=t1.bp_id)-->
+<!--                  and ${/session/@role_id} in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ) )-->
+<!--                  or (${/session/@role_id} not in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ))"/>-->
+<!--        <bm:data-filter name="query" expression="( (decode(${/session/@user_id}, 10600, 1, 2) = 1-->
+<!--                                                   and exists (select 1 from hls_bp_master hb where hb.bp_id = t1.bp_id-->
+<!--                                                   and hb.bp_code in  ('D00000028','D00000035','D00000016','D00000021','D00000039','D00000025','D00000034','D00000017','D00000018','D00000024','D00000032','D00000009','D00000012','D00000014','D00000015','D00000023')) )-->
+<!--                                                   or (decode(${/session/@user_id}, 10600, 1, 2) = 2) )"/>-->
+<!--    </bm:data-filters>-->
+</bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/gld_periods.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: DJ  
+    $Date: 2014-2-13 下午2:42:08  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="GLD_PERIODS" defaultOrderBy="t1.internal_period_num" needAccessControl="false">
+    <bm:fields>
+        <bm:field name="period_set_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_SET_CODE" prompt="GLD_PERIODS.PERIOD_SET_CODE"/>
+        <bm:field name="period_year" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PERIOD_YEAR" prompt="GLD_PERIODS.PERIOD_YEAR"/>
+        <bm:field name="period_num"  databaseType="NUMBER" datatype="java.lang.Long" physicalName="PERIOD_NUM" prompt="GLD_PERIODS.PERIOD_NUM"/>
+        <bm:field name="period_name" displayWidth="120" forDisplay="true" forQuery="true" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_NAME" prompt="GLD_PERIODS.PERIOD_NAME"/>
+        <bm:field name="adjustment_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ADJUSTMENT_FLAG" prompt="GLD_PERIODS.ADJUSTMENT_FLAG"/>
+        <bm:field name="internal_period_num"  displayWidth="120" forDisplay="true" forQuery="true"  physicalName="INTERNAL_PERIOD_NUM" prompt="期间号"/>
+        <bm:field name="start_date" databaseType="DATE" datatype="java.util.Date" physicalName="START_DATE" prompt="GLD_PERIODS.START_DATE"/>
+        <bm:field name="end_date"  displayWidth="130" forDisplay="true" databaseType="DATE" datatype="java.util.Date" physicalName="END_DATE" prompt="截止日期"/>
+        <bm:field name="quarter_num" databaseType="NUMBER" datatype="java.lang.Long" physicalName="QUARTER_NUM" prompt="GLD_PERIODS.QUARTER_NUM"/>
+    </bm:fields>
+    <bm:features>
+        <f:standard-who/>
+    </bm:features>
+    <bm:primary-key>
+        <bm:pk-field name="internal_period_num"/>
+        <bm:pk-field name="period_set_code"/>
+    </bm:primary-key>
+    <bm:query-fields>
+        <bm:query-field name="internal_period_num" queryExpression="t1.internal_period_num=${@internal_period_num}"/>
+        <bm:query-field name="period_name" queryExpression="t1.period_name=${@period_name}"/>
+    </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/uncertain.local.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <uncertain-engine defaultLogLevel="INFO">
     <path-config logPath="D:\soft\logs" uiPackageBasePath="D:\soft\hlcm\lib\LeafUI\src"/>
-</uncertain-engine>
+</uncertain-engine>
\ No newline at end of file

src/main/webapp/WEB-INF/web.xml

@@ -50,12 +50,12 @@
             <param-value>*</param-value>
         </init-param>
         <!--<init-param>-->
-            <!--<param-name>allowCredentials</param-name>-->
-            <!--<param-value>true</param-value>-->
+        <!--<param-name>allowCredentials</param-name>-->
+        <!--<param-value>true</param-value>-->
         <!--</init-param>-->
         <!--<init-param>-->
-            <!--<param-name>maxAge</param-name>-->
-            <!--<param-value>3600</param-value>-->
+        <!--<param-name>maxAge</param-name>-->
+        <!--<param-value>3600</param-value>-->
         <!--</init-param>-->
         <!--<init-param>-->
         <!--<param-name>exposedHeader</param-name>-->
@@ -69,7 +69,7 @@
     <filter>
         <filter-name>encodingFilter</filter-name>
         <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-       <async-supported>true</async-supported>
+        <async-supported>true</async-supported>
         <init-param>
             <param-name>encoding</param-name>
             <param-value>UTF-8</param-value>
@@ -236,15 +236,13 @@
     </servlet-mapping>
 
 
-
-
     <!--<servlet>-->
-        <!--<servlet-name>ureportServlet</servlet-name>-->
-        <!--<servlet-class>com.bstek.ureport.console.UReportServlet</servlet-class>-->
+    <!--<servlet-name>ureportServlet</servlet-name>-->
+    <!--<servlet-class>com.bstek.ureport.console.UReportServlet</servlet-class>-->
     <!--</servlet>-->
     <!--<servlet-mapping>-->
-        <!--<servlet-name>ureportServlet</servlet-name>-->
-        <!--<url-pattern>/ureport/*</url-pattern>-->
+    <!--<servlet-name>ureportServlet</servlet-name>-->
+    <!--<url-pattern>/ureport/*</url-pattern>-->
     <!--</servlet-mapping>-->
     <error-page>
         <error-code>400</error-code>

src/main/webapp/leafresource/leaf.ui.std/hap/grid/Grid-min.js

@@ -2928,7 +2928,8 @@
                 exportOptions = sf.exportOptions || (sf.exportOptions = {}),
                 type = exportOptions && exportOptions.type;
             EACH(sf.columns, function(c, i) {
-                if (!sf.isFunctionCol(c.type)) {
+                // modify by niminmin 隐藏列不需要显示
+                if (!sf.isFunctionCol(c.type)&&c.forexport) {
                     if (exportall) {
                         exportall = c.forexport !== FALSE
                     }

src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview

@@ -21,6 +21,8 @@
                 modelaction="execute"/>
         <a:link id="${/parameter/@layout_code}con_contract_query_link"
                 url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
+        <a:link id="contract_ifrs9_sum_report_link"
+                url="${/request/@context_path}/modules/cont/CON3500/contract_ifrs9_sum_report.lview"/>
         <style>
             body{
                 font-size: 12px;
@@ -102,7 +104,7 @@
             // $(ds_id).query();
 
 
-        }
+        };
 
         //保存数据
         window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
@@ -131,7 +133,7 @@
                 },
                 scope: this
             });
-        }
+        };
         //获取查询结果
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_ifrs9');
@@ -165,7 +167,26 @@
                 scope: this
             });
 
-        }
+        };
+     //承租人最大逾期天数
+        window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
+          var  url = $('contract_ifrs9_sum_report_link').getUrl();
+            new Leaf.Window({
+                id: 'contract_ifrs9_sum_report_link_winid',
+                params: {
+                    winId: 'contract_ifrs9_sum_report_link_winid',
+                    period_name:'${/parameter/@period_name}'
+                },
+                url: url,
+                title: '承租人最大逾期天数',
+                width: 600,
+                height: 400
+            }).on('close', function () {
+              null;
+            });
+
+
+        };
 
 
         ]]></script>

src/main/webapp/modules/cont/CON3500/contract_ifrs9_sum_report.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
+    <a:view>
+        <script type="text/javascript"><![CDATA[
+        // 退出按钮
+        function contract_ifrs9_sum_back() {
+            $('${/parameter/@winId}').close();
+        }
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="contract_ifrs9_sum_report_ds" fetchAll="true" autoQuery="true"
+                       model="cont.CON3500.contract_ifrs9_sum_report"
+                       queryUrl="${/request/@context_path}/autocrud/cont.CON3500.contract_ifrs9_sum_report/query?period_name=${/parameter/@period_name}"
+            />
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:screenTitle/>
+                <a:gridButton click=" contract_ifrs9_sum_back
+            " text="HLS.BACK"/>
+            </a:screenTopToolbar>
+            <a:grid id="contract_ifrs9_sum_report_ds_id" bindTarget="contract_ifrs9_sum_report_ds"
+                    marginHeight="200" marginWidth="800" navBar="true" >
+                <a:columns>
+                    <a:column name="bp_code" prompt="商业伙伴编号" width="250" align="center"/>
+                    <a:column name="max_overdue_days" prompt="承租人最大逾期期数" width="150"
+                              align="center"/>
+
+                </a:columns>
+            </a:grid>
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/cont/CON_ET001/create_content_for_con_et.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
+    <a:init-procedure>
+        <s:server-script import="contract_print_path.js"><![CDATA[
+            importPackage(java.io);
+            importPackage(Packages.hls.plugin.docx4j);
+            importPackage(Packages.leaf.plugin.word2pdf);
+            importPackage(Packages.org.apache.commons.io);
+
+
+            function RandomString(length) {   
+            var str = '';   
+            for (;str.length < length;str += Math.random().toString(36).substr(2));   
+            return str.substr(0, length); 
+            }
+
+            //删除文件
+
+            function deleteFile(filePath) {
+            var file = new File(filePath);
+            if (file.exists()) {
+            file.delete();
+            }
+            }
+
+            //生成pdf
+               function wordToPdf(word_file_path,pdf_file_path) {
+                // word转pdf
+                var pdf_file_path_new = pdf_file_path + '.pdf';
+                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
+                wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
+                //删除word文件
+               // deleteFile(word_file_path);
+
+                return pdf_file_path_new;
+            }
+
+            function copyFile(fOld, fNew) {
+            var fis = new java.io.FileInputStream(fOld);
+            var fos = new java.io.FileOutputStream(fNew);
+            var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 4);
+            var len = -1;
+            while ((len = fis.read(b)) != -1) {
+            fos.write(b, 0, len);
+            }
+            fis.close();
+            fos.close();
+            }
+
+            //按日期创建目录
+
+
+            function getDatePath() {
+            set_parameter_file_path();
+            var file_path = $ctx.parameter.file_path; //file_path = c:/hls_test_files/content_files/
+            var now = new Date()
+            y = now.getFullYear()
+            m = now.getMonth() + 1
+            m = m < 10 ? "0" + m : m
+            var datePath = file_path + y + "/" + m + "/";
+            return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
+            }
+
+            function write_os_to_file(file, os) {
+            var fis = new FileInputStream(file);
+            var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
+            var len = -1;
+            while ((len = fis.read(b)) != -1) {
+            os.write(b, 0, len);
+            }
+            fis.close();
+            }
+
+            function download_file(file_path, file_name) {
+            $ctx["__request_type__"] = 'file';
+            var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
+            resp.setHeader("Pragma", "No-cache");
+            resp.setHeader("Cache-Control", "no-cache, must-revalidate");
+            resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(file_name, 'utf-8'));
+            resp.setDateHeader("Expires", 0);
+            resp.setContentType("application/x-msdownload");
+            try {
+            var os = resp.getOutputStream();
+            write_os_to_file(file_path, os);
+
+            os.flush();
+            } catch (e) {
+            $logger("server-script").severe(e.message);
+            }
+            }
+
+            function collection_create_content() {
+            try {
+            //第一步生成合同文本
+            $bm('cont.CON620.create_content_for_collection').update({
+            contract_id: $ctx.parameter.contract_id,
+            templet_code: $ctx.parameter.templet_code
+            });
+            //获取日期目录
+            var datePath = getDatePath();
+            $ctx.parameter.batch_flag='Y';
+            FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
+            var from_file_data_map = $bm('cont.CON500.con_doc_file_templet_get_atm_new').queryAsMap({
+            contract_id: $ctx.parameter.contract_id,
+            batch_flag:$ctx.parameter.batch_flag,
+            templet_code: $ctx.parameter.templet_code
+            });
+            var from_file_data = from_file_data_map.getChildren();
+            for (var i = 0;i < from_file_data.length;i++) {
+            var to_file_path = $ctx.parameter.file_path;
+            var record_data = from_file_data[i];
+            if (record_data.file_exists_flag != 'Y') {
+            var to_file_name = record_data.to_file_name + '.' + record_data.file_type_code || 'doc';
+            var from_file_path = record_data.file_path;
+            var guid_file_name_path = $bm('cont.CON500.con_contract_get_guid_file_name').queryAsMap();
+            var guid_file_name_tables = guid_file_name_path.getChildren();
+            to_file_path = datePath + guid_file_name_tables[0].guid_file_name + 'con' + record_data.content_id;
+
+            copyFile(from_file_path, to_file_path);
+            try {
+            var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
+            brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id);
+            } catch (e) {
+            raise_app_error(e);
+            }
+            // word转pdf
+            var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;
+            var outputfilepath = wordToPdf(to_file_path,pdf_file_path);
+            var outputfilename= record_data.to_file_name +'.pdf';
+            var pdf_file = new File(outputfilepath);
+            var file_size = 0;
+            if (pdf_file.exists()) {
+            file_size = pdf_file.length();
+            }
+              //保存文本名及路径
+            $bm('cont.CON500.con_file_content_copy_update').execute({
+            table_name: 'CON_CONTRACT_CONTENT',
+            content_id: record_data.content_id,
+            file_name: outputfilename.toString(),
+            file_path: outputfilepath.toString(),
+            file_size: file_size,
+            file_type_code: 'pdf',
+            mime_type: 'application/pdf',
+            user_id: $ctx.parameter.user_id
+            });
+
+            download_file(outputfilepath.toString(),outputfilename.toString());
+            }
+            }
+
+
+            $ctx.parameter.return_status = 'S';
+            $ctx.parameter.return_message = '执行成功';
+            } catch (e) {
+            $ctx.success = "true";
+            $ctx.parameter.return_status = 'E';
+            $ctx.parameter.return_message = $ctx.get('/error/@message') || String(e);
+            raise_app_error(e);
+            }
+            var result = {
+            result: $ctx.parameter.return_status,
+            message: $ctx.parameter.return_message
+            };
+            $ctx.parameter.json = JSON.stringify(result);
+            }
+
+            if ($ctx.parameter.return_status != 'E' && $ctx.parameter.return_status != 'TIMEOUT') {
+            collection_create_content();
+            }
+            ]]></s:server-script>
+    </a:init-procedure>
+    <a:service-output/>
+</a:service>

src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview

@@ -28,10 +28,11 @@
                 var req_status = record.get('req_status');
                 var change_req_id = record.get('change_req_id');
                 var contract_id=record.get('contract_id');
+                var simulation_flag=record.get('simulation_flag');
                 if('NEW' == req_status){
-                    return '<a href="javascript:open_change_req_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
+                    return '<a href="javascript:open_change_req_detail(' + change_req_id + ',' + contract_id + ',' + record.id + ')">'+value+'</a>';
                 }else{
-                    return '<a href="javascript:open_change_req_readonly_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
+                    return '<a href="javascript:open_change_req_readonly_detail(' + change_req_id + ',' + contract_id + ',' + record.id + ')">'+value+'</a>';
                 }
             }
             return value;
@@ -72,7 +73,8 @@
             window.open(url, '_self');*/
         }
 
-        function open_change_req_detail(change_req_id,contract_id) {
+        function open_change_req_detail(change_req_id,contract_id,id) {
+            var current_record = $('contractQueryScreen_mainDs').findById(id);
             var param = {};
             param['change_req_id'] = change_req_id;
             param['contract_id'] = change_req_id;
@@ -84,9 +86,12 @@
             param['maintain_type'] = 'UPDATE';
             param['document_type'] = 'ET_CHAG';
             param['winid'] = 'con_et003_detail_winid';
+            param['simulation_flag'] =current_record.get('simulation_flag');
             hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
         }
-        function open_change_req_readonly_detail(change_req_id,contract_id) {
+        function open_change_req_readonly_detail(change_req_id,contract_id,id) {
+                debugger;
+            var current_record = $('contractQueryScreen_mainDs').findById(id);
             var param = {};
             param['change_req_id'] = change_req_id;
             param['contract_id'] = change_req_id;
@@ -98,6 +103,7 @@
             param['maintain_type'] = 'QUERY';
             param['document_type'] = 'ET_CHAG';
             param['winid'] = 'con_et003_detail_winid';
+            param['simulation_flag'] =current_record.get('simulation_flag');
             hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
         }
 
@@ -173,7 +179,7 @@
                 <a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
                 <a:gridButton click="con_gur_np_pint" text="合同文本打印" id="con_gur_np_pint_id"/>
             </a:screenTopToolbar>
-            <a:form column="3" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
+            <a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
                 <a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/>
                 <a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
                 <a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
@@ -185,7 +191,7 @@
                 <a:datePicker name="termination_date_to" bindTarget="contractQueryScreen_paraDs" prompt="提前结清日到"/>
                 <a:comboBox name="req_status_n" bindTarget="contractQueryScreen_paraDs" prompt="变更审批状态"/>
             </a:form>
-            <a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true">
+            <a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="200" marginWidth="40" navBar="true">
                 <a:columns>
                     <a:column name="change_req_number" prompt="变更申请编号" width="120" align="left" renderer="open_change_req"/>
                     <a:column name="contract_number" prompt="合同编号" width="120" align="left"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_sum_report.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
+    <a:view>
+        <script type="text/javascript"><![CDATA[
+        // 退出按钮
+        function cus_deposit122_sum_back() {
+            $('${/parameter/@winId}').close();
+        }
+        function cus_deposit122_sum_query() {
+            $('csh_transaction_deposit_sum_report_ds').query();
+        }
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="csh_transaction_receipt_sum_query_ds" autoCreate="true">
+                <a:fields>
+                    <a:field name="calc_date" lovGridHeight="300" lovHeight="500"
+                             lovService="cus_deposit.CUS_DEPOSIT122.gld_periods"
+                             lovWidth="500" required="true" title="GLD_PERIODS.PERIOD_NAME" validator="">
+                        <a:mapping>
+                            <a:map from="end_date" to="calc_date"/>
+                        </a:mapping>
+                    </a:field>
+                    <a:field name="deposit_trans_type_desc" defaultValue="租金保证金" readOnly="true"/>
+                    <a:field name="query_amount_flag_n" defaultValue="剩余金额大于0" readOnly="true"/>
+                </a:fields>
+            </a:dataSet>
+            <a:dataSet id="csh_transaction_deposit_sum_report_ds" autoPageSize="true"
+                       model="cus_deposit.CUS_DEPOSIT122.csh_transaction_deposit_sum_report_query"
+                       queryDataSet="csh_transaction_receipt_sum_query_ds"
+            />
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:screenTitle/>
+                <a:gridButton click="cus_deposit122_sum_back" text="HLS.BACK"/>
+                <a:gridButton click="cus_deposit122_sum_query" text="HLS.QUERY"/>
+            </a:screenTopToolbar>
+            <a:form bindTarget="csh_transaction_receipt_sum_query_ds" column="3" labelWidth="130" marginWidth="80">
+                <a:lov name="calc_date" prompt="截至日期"
+                       bindTarget="csh_transaction_receipt_sum_query_ds" renderer="Leaf.formatDate"/>
+                <a:textField name="deposit_trans_type_desc" prompt="保证金类型"
+                             bindTarget="csh_transaction_receipt_sum_query_ds"/>
+                <a:textField name="query_amount_flag_n" bindTarget="csh_transaction_receipt_sum_query_ds"
+                             prompt="剩余可用金额"/>
+            </a:form>
+            <a:grid id="csh_transaction_deposit_sum_report_id" bindTarget="csh_transaction_deposit_sum_report_ds"
+                    marginHeight="150" marginWidth="238" navBar="true">
+                <a:columns>
+                    <a:column name="contract_number" prompt="合同编号" width="250" align="center"/>
+                    <a:column name="unwrite_off_amount" prompt="租金保证金汇总" renderer="Leaf.formatMoney" width="150" align="right"/>
+
+                </a:columns>
+            </a:grid>
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/zjwfl/WFL2110/zj_wfl_workflow_deliver_create.lview

@@ -131,12 +131,12 @@
                     <a:field name="workflow_code"/>
                 </a:fields>
             </a:dataSet>
-            <a:dataSet id="batch_workflow_ds" autoQuery="true" pageSize="5" fetchAll="false" model="zjwfl.zj_wfl_workflow" queryDataSet="batch_workflow_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_batch/batch_update">
+            <a:dataSet id="batch_workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow" queryDataSet="batch_workflow_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_batch/batch_update">
                 <a:events>
                     <a:event name="submitsuccess" handler="onSuccess"/>
                 </a:events>
             </a:dataSet>
-            <a:dataSet id="workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow_dilever" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?ORDER_FIELD=w.workflow_code,t.date_from" selectable="true"/>
+            <a:dataSet id="workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow_dilever" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y&amp;ORDER_FIELD=w.workflow_code,t.date_from" selectable="true"/>
             <a:dataSet id="wfl_workflow_deliver_create_query_ds" autoCreate="true" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query"/>
             <a:dataSet id="wfl_workflow_deliver_create_ds" autoQuery="true" pageSize="5" fetchAll="false" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query" queryDataSet="wfl_workflow_deliver_create_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.zj_wfl_workflow_deliver_query/query?ORDER_FIELD=z.workflow_desc,t.date_from" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_modify/batch_update">
                 <a:fields>