Skip to content

L
leaf-hlcm
Commit fddf5665 authored by liyuan.chen's avatar liyuan.chen
Browse files
Options

月结及其它修改

parent e6f982bd
Pipeline #6364 canceled with stages
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 599 additions and 78 deletions
      src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm
      View file @ fddf5665
      ...@@ -67,18 +67,14 @@ ...@@ -67,18 +67,14 @@
      AND ccc.cf_item IN (1, 8, 250) AND ccc.cf_item IN (1, 8, 250)
      AND trunc(ccc.due_date) <= trunc(SYSDATE)) - AND trunc(ccc.due_date) <= trunc(SYSDATE)) -
      nvl((SELECT SUM(nvl(gwo.write_off_amount, 0)) nvl((SELECT SUM(nvl(gwo.write_off_amount, 0))
      FROM gld_write_off gwo FROM gld_write_off gwo ,con_contract_cashflow ccw
      WHERE gwo.reversed_flag = 'N' WHERE gwo.reversed_flag = 'N'
      AND gwo.contract_id = cc.contract_id AND gwo.contract_id = cc.contract_id
      AND gwo.cf_item IN (1, 8, 250) AND gwo.cf_item IN (1, 8, 250)
      And Exists and gwo.cf_item =ccw.cf_item
      (Select 1 and gwo.times =ccw.times
      From con_contract_cashflow cn, csh_write_off cw and gwo.contract_id =ccw.contract_id
      Where cw.write_off_id = gwo.csh_write_off_id AND trunc(ccw.due_date) <= trunc(SYSDATE)),0) account_due_amount,
      And cn.cashflow_id = cw.cashflow_id
      And cn.cf_status = 'RELEASE'
      And trunc(cn.due_date) <= trunc(Sysdate))),
      0) account_due_amount,
      contract_item_query_pkg.calc_business_overdue_times(p_contract_id => cc.contract_id, contract_item_query_pkg.calc_business_overdue_times(p_contract_id => cc.contract_id,
      p_calc_date => SYSDATE, p_calc_date => SYSDATE,
      ...@@ -110,7 +106,8 @@ ...@@ -110,7 +106,8 @@
      FROM con_contract_cashflow ccc FROM con_contract_cashflow ccc
      WHERE ccc.contract_id = cc.contract_id WHERE ccc.contract_id = cc.contract_id
      AND ccc.cf_item = 9 AND ccc.cf_item = 9
      AND ccc.write_off_flag <> 'FULL') over_due_amount, AND ccc.write_off_flag <> 'FULL'
      and ccc.cf_status = 'RELEASE') over_due_amount,
      --营业最早逾期的预定支付日 --营业最早逾期的预定支付日
      (SELECT to_char(MIN(ccc.due_date),'yyyy-mm-dd') (SELECT to_char(MIN(ccc.due_date),'yyyy-mm-dd')
      ...@@ -177,6 +174,7 @@ ...@@ -177,6 +174,7 @@
      AND TRUNC(ccw.due_date)<=TRUNC(SYSDATE) AND TRUNC(ccw.due_date)<=TRUNC(SYSDATE)
      AND ccw.due_amount>nvl(ccw.received_amount, 0) AND ccw.due_amount>nvl(ccw.received_amount, 0)
      AND ccw.write_off_flag <> 'FULL' AND ccw.write_off_flag <> 'FULL'
      AND ccw.cf_status = 'RELEASE'
      AND ccw.cf_direction = 'INFLOW') AND ccw.cf_direction = 'INFLOW')
      AND ('Y' = 'Y' AND EXISTS AND ('Y' = 'Y' AND EXISTS
      (SELECT 1 (SELECT 1
      ......
      src/main/webapp/WEB-INF/classes/hls/HLS801/con_unearned_finance_income.lwm
      View file @ fddf5665
      ...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
      <bm:field name="calc_end_date" databaseType="DATE" datatype="java.util.Date" physicalName="CALC_END_DATE" prompt="CON_UNEARNED_FINANCE_INCOME.CALC_END_DATE"/> <bm:field name="calc_end_date" databaseType="DATE" datatype="java.util.Date" physicalName="CALC_END_DATE" prompt="CON_UNEARNED_FINANCE_INCOME.CALC_END_DATE"/>
      <bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select p.project_name from prj_project p ,con_contract c where c.contract_id = t1.contract_id and p.project_id = c.project_id)" forInsert="false" forUpdate="false"/> <bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select p.project_name from prj_project p ,con_contract c where c.contract_id = t1.contract_id and p.project_id = c.project_id)" forInsert="false" forUpdate="false"/>
      <bm:field name="finance_amount" databaseType="NUMBER" datatype="java.lang.Double" expression="(select c.finance_amount from con_contract c where c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/> <bm:field name="finance_amount" databaseType="NUMBER" datatype="java.lang.Double" expression="(select c.finance_amount from con_contract c where c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/>
      <bm:field name="period" databaseType="VARCHAR2" datatype="java.lang.String" expression="((CASE WHEN t1.cf_item = 8 THEN (SELECT to_char(cf1.due_date,&apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf1 WHERE cf1.contract_id = t1.contract_id AND cf1.cf_item = t1.cf_item)||'-'||(SELECT TO_CHAR(cf.due_date, &apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf WHERE cf.cashflow_id = t1.cashflow_id) ELSE ( (SELECT to_char(cf1.due_date,&apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf1 WHERE cf1.contract_id = t1.contract_id AND cf1.cf_item = t1.cf_item AND cf1.times = (SELECT cf.times - 1 FROM con_contract_cashflow cf WHERE cf.cashflow_id = t1.cashflow_id)) ||'-'|| (SELECT TO_CHAR(cf.due_date -1, &apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf WHERE cf.cashflow_id = t1.cashflow_id))END))" forInsert="false" forUpdate="false"/> <bm:field name="period" databaseType="VARCHAR2" datatype="java.lang.String" expression="((CASE WHEN t1.cf_item = 8 THEN (SELECT to_char(cf1.due_date,&apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf1 WHERE cf1.contract_id = t1.contract_id AND cf1.cf_item = t1.cf_item)|| '-' ||(SELECT TO_CHAR(cf.due_date, &apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf WHERE cf.cashflow_id = t1.cashflow_id) ELSE ( (SELECT to_char(cf1.due_date,&apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf1 WHERE cf1.contract_id = t1.contract_id AND cf1.cf_item = t1.cf_item AND cf1.times = (SELECT cf.times - 1 FROM con_contract_cashflow cf WHERE cf.cashflow_id = t1.cashflow_id)) || nvl2((Select to_char(cf1.due_date, 'yyyy/mm/dd') From con_contract_cashflow cf1 Where cf1.contract_id = t1.contract_id And cf1.cf_item = t1.cf_item And cf1.times = (Select cf.times - 1 From con_contract_cashflow cf Where cf.cashflow_id = t1.cashflow_id)), '-', '') || (SELECT TO_CHAR(cf.due_date -1, &apos;yyyy/mm/dd&apos;) FROM con_contract_cashflow cf WHERE cf.cashflow_id = t1.cashflow_id))END))" forInsert="false" forUpdate="false"/>
      <bm:field name="interest" databaseType="NUMBER" datatype="java.lang.Double" expression="(select c.interest from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id)" forInsert="false" forUpdate="false"/> <bm:field name="interest" databaseType="NUMBER" datatype="java.lang.Double" expression="(select c.interest from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id)" forInsert="false" forUpdate="false"/>
      <bm:field name="int_rate_implicit" databaseType="NUMBER" datatype="java.lang.Double" expression="round((select c.int_rate from con_contract c where c.contract_id = t1.contract_id),4)" forInsert="false" forUpdate="false"/> <bm:field name="int_rate_implicit" databaseType="NUMBER" datatype="java.lang.Double" expression="round((select c.int_rate from con_contract c where c.contract_id = t1.contract_id),4)" forInsert="false" forUpdate="false"/>
      <bm:field name="calc_period" databaseType="VARCHAR2" datatype="java.lang.String" expression="(to_char(t1.calc_start_date,&apos;yyyy/mm/dd&apos;)||&apos;-&apos;||to_char(t1.calc_end_date,&apos;yyyy/mm/dd&apos;))" forInsert="false" forUpdate="false"/> <bm:field name="calc_period" databaseType="VARCHAR2" datatype="java.lang.String" expression="(to_char(t1.calc_start_date,&apos;yyyy/mm/dd&apos;)||&apos;-&apos;||to_char(t1.calc_end_date,&apos;yyyy/mm/dd&apos;))" forInsert="false" forUpdate="false"/>
      ......
      src/main/webapp/WEB-INF/classes/hls/HLS801/csh_current_period_query.lwm 0 → 100644
      View file @ fddf5665
      <?xml version="1.0" encoding="UTF-8"?>
      <!--
      $Author: qwm
      $Date: 2013-12-28 下午1:31:12
      $Revision: 1.0
      $Purpose:
      -->
      <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
      <bm:operations>
      <bm:operation name="query">
      <bm:query-sql><![CDATA[
      Select to_char(t1.transaction_date, 'yyyy-mm') csh_date,
      Count(t1.transaction_id) csh_count,
      Count(t1.csh_not_id) csh_not,
      Count(t1.csh_partial_id) csh_partial,
      decode(Count(t1.transaction_id), Count(t1.csh_confirm), 'Y', 'N') As csh_confirm_flag,
      t1.ref_v04
      From (Select t.transaction_date,
      t.transaction_id,
      (Select c.transaction_id
      From csh_transaction c
      Where c.transaction_id = t.transaction_id
      And nvl(c.write_off_flag, 'NOT') = 'NOT') As csh_not_id,
      (Select c1.transaction_id
      From csh_transaction c1
      Where c1.transaction_id = t.transaction_id
      And nvl(c1.write_off_flag, 'NOT') = 'PARTIAL') As csh_partial_id,
      (Select c2.transaction_id
      From csh_transaction c2
      Where c2.transaction_id = t.transaction_id
      And nvl(c2.business_monthly_flag, 'N') = 'Y') As csh_confirm,
      t.ref_v04
      From csh_transaction t
      Where t.confirmed_flag in ('ACCAUDITED','APPROVED', 'WF_REJECTED', 'WF_APPROVING')
      And t.transaction_type not in ('DEPOSIT', 'PAYMENT')
      And t.returned_flag <> 'RETURN') t1
      Where to_char(t1.transaction_date, 'yyyymm') < to_char(sysdate, 'yyyymm')
      Group By to_char(t1.transaction_date, 'yyyy-mm'), t1.ref_v04
      Order By to_char(t1.transaction_date, 'yyyy-mm') desc
      ]]></bm:query-sql>
      </bm:operation>
      <bm:operation name="update">
      <bm:update-sql><![CDATA[
      begin
      hls_monthend_new_pkg.csh_transaction_confirm(
      p_role_flag => ${@role_flag},
      p_csh_date => ${@csh_date},
      p_ref_v04 => ${@ref_v04},
      p_user_id => ${/session/@user_id});
      end;
      ]]></bm:update-sql>
      </bm:operation>
      </bm:operations>
      </bm:model>
      src/main/webapp/WEB-INF/classes/hls/HLS801/sys_role_flag.lwm 0 → 100644
      View file @ fddf5665
      <?xml version="1.0" encoding="UTF-8"?>
      <!--
      $Author:
      $Date: 2020-05-11
      $Revision: 1.0
      $Purpose:
      -->
      <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
      <bm:fields>
      <bm:field name="role_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ROLE_CODE"/>
      </bm:fields>
      <bm:operations>
      <bm:operation name="query">
      <bm:query-sql><![CDATA[
      Select nvl((Select decode(t.role_code,
      '0006',
      'NO',
      '0014',
      'YES',
      '0013',
      'YES',
      '0017',
      'YES',
      'HAND',
      'YES',
      'N')
      From sys_role t
      Where t.role_id = ${/session/@role_id}),
      'N') As role_code
      From dual
      ]]></bm:query-sql>
      </bm:operation>
      </bm:operations>
      </bm:model>
      src/main/webapp/modules/cont/CON301N/con_contract_finish_seal_info.lview
      View file @ fddf5665
      ...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
      </a:dataSet> </a:dataSet>
      </a:dataSets> </a:dataSets>
      <a:screenBody> <a:screenBody>
      <a:grid id="seal_info_ds_id" bindTarget="seal_info_ds" height="250" marginWidth="655" navBar="true"> <a:grid id="seal_info_ds_id" bindTarget="seal_info_ds" height="300" marginWidth="140" navBar="true">
      <a:columns> <a:columns>
      <a:column name="instruments_types" prompt="文书种类"/> <a:column name="instruments_types" prompt="文书种类" width="150"/>
      <a:column name="common_seal" prompt="公章" editor="seal_info_check_id"/> <a:column name="common_seal" prompt="公章" editor="seal_info_check_id" width="150"/>
      <a:column name="corporate_visa_seal" prompt="法人签证章" editor="seal_info_check_id"/> <a:column name="corporate_visa_seal" prompt="法人签证章" editor="seal_info_check_id" width="150"/>
      <a:column name="legal_seal" prompt="法人章" editor="seal_info_check_id"/> <a:column name="legal_seal" prompt="法人章" editor="seal_info_check_id" width="150"/>
      <a:column name="con_special_seal" prompt="合同专用章" editor="seal_info_check_id"/> <a:column name="con_special_seal" prompt="合同专用章" editor="seal_info_check_id" width="150"/>
      <a:column name="financial_seal" prompt="财务章" editor="seal_info_check_id"/> <a:column name="financial_seal" prompt="财务章" editor="seal_info_check_id" width="150"/>
      <a:column name="supervisio_seal" prompt="监管专用章" editor="seal_info_check_id"/> <a:column name="supervisio_seal" prompt="监管专用章" editor="seal_info_check_id" width="150"/>
      <a:column name="seal_number_n" prompt="文书部数"/> <a:column name="seal_number_n" prompt="文书部数" width="150"/>
      </a:columns> </a:columns>
      <a:editors> <a:editors>
      <a:checkBox id="seal_info_check_id"/> <a:checkBox id="seal_info_check_id"/>
      ......
      src/main/webapp/modules/cont/CON301N/con_contract_query_entrance.lview
      View file @ fddf5665
      ...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
      // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_CONTRACT_RESULT', 'con_contract'); // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_CONTRACT_RESULT', 'con_contract');
      Leaf.onReady(function() { Leaf.onReady(function() {
      debugger;
      if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") { if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
      document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM_prompt").style.display = ""; document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM_prompt").style.display = "";
      document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM").style.display = ""; document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM").style.display = "";
      ...@@ -102,22 +101,31 @@ ...@@ -102,22 +101,31 @@
      }, },
      url: $('${/parameter/@layout_code}_contract_seal_link_id').getUrl(), url: $('${/parameter/@layout_code}_contract_seal_link_id').getUrl(),
      title: '用印信息', title: '用印信息',
      width: 1300, width: 1240,
      height: 350 height: 350
      }); });
      } }
      /*
      @Modified: Liyuan.Chen
      @Date: 2020/5/18
      @Description: _self 换成 _blank
      @Param:
      */
      function download_recovery(record_id, ds_id){ function download_recovery(record_id, ds_id){
      var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
      var contract_id = record.get('contract_id'); var contract_id = record.get('contract_id');
      var url_l = $('con_contract_finish_print_link_id').getUrl() + '?document_id=' + contract_id + '&document_table=CON_CONTRACT_FINISH&batch_flag=Y&source_type=COMMON'; var url_l = $('con_contract_finish_print_link_id').getUrl() + '?document_id=' + contract_id + '&document_table=CON_CONTRACT_FINISH&batch_flag=Y&source_type=COMMON';
      window.open(href = url_l, target = "_self"); // window.open(href = url_l, target = "_self");
      var OpenWindow = window.open(href = url_l, target = "_blank");
      //OpenWindow.alert('正在下载...');
      } }
      function download_ownership(record_id, ds_id){ function download_ownership(record_id, ds_id){
      var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
      var contract_id = record.get('contract_id'); var contract_id = record.get('contract_id');
      var url_l = $('con_contract_finish_print_link_id').getUrl() + '?document_id=' + contract_id + '&document_table=CON_CONTRACT_FINISH_LEASE&batch_flag=Y&source_type=COMMON'; var url_l = $('con_contract_finish_print_link_id').getUrl() + '?document_id=' + contract_id + '&document_table=CON_CONTRACT_FINISH_LEASE&batch_flag=Y&source_type=COMMON';
      window.open(href = url_l, target = "_self"); window.open(href = url_l, target = "_blank");
      } }
      window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) { window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
      ......
      src/main/webapp/modules/cont/CON620/con_contract_rent_dun_query.lview
      View file @ fddf5665
      ...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
      } }
      } }
      if (name == "over_due_amount") { if (name == "over_due_amount") {
      debugger;
      var t_1 = record.get("over_due_amount")||0; var t_1 = record.get("over_due_amount")||0;
      var t_2 = parseFloat(t_1); var t_2 = parseFloat(t_1);
      if (!isNaN(t_2)) { if (!isNaN(t_2)) {
      ...@@ -172,28 +171,35 @@ ...@@ -172,28 +171,35 @@
      } }
      Leaf.onReady(function() { Leaf.onReady(function() {
      if("${/model/role_info/record/@role_code}"=="0018"||"${/model/role_info/record/@role_code}"=="0019"){ if("${/model/role_info/record/@role_code}"=="0018"||"${/model/role_info/record/@role_code}"=="0019"){
      $('CON601_con_contract_grid_ds').hideColumn('account_due_times'); $('CON601_con_contract_grid_ds').hideColumn('account_due_times');
      $('CON601_con_contract_grid_ds').hideColumn('account_due_days'); $('CON601_con_contract_grid_ds').hideColumn('account_due_days');
      $('CON601_con_contract_grid_ds').hideColumn('account_due_amount'); $('CON601_con_contract_grid_ds').hideColumn('account_due_amount');
      $('CON601_con_contract_grid_ds').hideColumn('ac_received_amount'); $('CON601_con_contract_grid_ds').hideColumn('ac_received_amount');
      $('CON601_con_contract_grid_ds').hideColumn('ac_unreceived_amount'); $('CON601_con_contract_grid_ds').hideColumn('ac_unreceived_amount');
      document.getElementById('account_due_times_from_id').style.display = "none"; document.getElementById('account_due_times_from_id').style.display = "none";
      document.getElementById('account_due_times_from_id_prompt').style.display = "none"; document.getElementById('account_due_times_from_id_prompt').style.display = "none";
      document.getElementById('account_due_times_to_id').style.display = "none"; document.getElementById('account_due_times_to_id').style.display = "none";
      document.getElementById('account_due_times_to_id_prompt').style.display = "none"; document.getElementById('account_due_times_to_id_prompt').style.display = "none";
      document.getElementById('account_due_days_from_id').style.display = "none"; document.getElementById('account_due_days_from_id').style.display = "none";
      document.getElementById('account_due_days_from_id_prompt').style.display = "none"; document.getElementById('account_due_days_from_id_prompt').style.display = "none";
      document.getElementById('account_due_days_to_id').style.display = "none"; document.getElementById('account_due_days_to_id').style.display = "none";
      document.getElementById('account_due_days_to_id_prompt').style.display = "none"; document.getElementById('account_due_days_to_id_prompt').style.display = "none";
      document.getElementById('account_due_amount_from_id').style.display = "none"; document.getElementById('account_due_amount_from_id').style.display = "none";
      document.getElementById('account_due_amount_from_id_prompt').style.display = "none"; document.getElementById('account_due_amount_from_id_prompt').style.display = "none";
      document.getElementById('account_due_amount_to_id').style.display = "none"; document.getElementById('account_due_amount_to_id').style.display = "none";
      document.getElementById('account_due_amount_to_id_prompt').style.display = "none"; document.getElementById('account_due_amount_to_id_prompt').style.display = "none";
      var grid_id = $('CON601_con_contract_grid_ds'); var grid_id = $('CON601_con_contract_grid_ds');
      grid_id.hideColumn('account_due_times'); grid_id.hideColumn('account_due_times');
      grid_id.hideColumn('account_due_days'); grid_id.hideColumn('account_due_days');
      grid_id.hideColumn('account_due_amount'); grid_id.hideColumn('account_due_amount');
      } }
      if("${/model/role_info/record/@role_code}"=="0020"||"${/model/role_info/record/@role_code}"=="0030"){
      $('CON601_con_contract_grid_ds').hideColumn('account_due_times');
      $('CON601_con_contract_grid_ds').hideColumn('account_due_days');
      $('CON601_con_contract_grid_ds').hideColumn('account_due_amount');
      $('CON601_con_contract_grid_ds').hideColumn('ac_received_amount');
      $('CON601_con_contract_grid_ds').hideColumn('ac_unreceived_amount');
      }
      }); });
      ]]></script> ]]></script>
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment