Skip to content

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

Merge branch 'feature/liyuan' into develop

parents 86c9e2cb 9f7e7cb5
Pipeline #6025 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 63 additions and 1 deletion
      src/main/webapp/WEB-INF/classes/cont/CON3100N/business_write_detail_report.lwm
      View file @ ad90b6e8
      ......@@ -63,5 +63,24 @@
      <bm:data-filters>
      <bm:data-filter enforceOperations="query" expression="t.session_id=${/session/@session_id}"/>
      <bm:data-filter enforceOperations="query" expression="exists (select 1 from aut_trx_user_authorize a1, aut_owner_user_authorize a2 WHERE a1.trx_category = 'CONTRACT' and a1.trx_id = t.contract_id AND trunc(sysdate) between a1.start_date AND nvl(a1.end_date, trunc(sysdate)) and a1.user_id = a2.owner_user_id AND a1.trx_category = a2.trx_category AND a2.authorized_user_id = ${/session/@user_id} AND trunc(sysdate) between a2.start_date and nvl(a2.end_date, trunc(sysdate)))"/>
      <bm:data-filter name="query" expression="( decode(${/session/@user_id}, 10620, 1, 2) = 1
      and exists (select 1 from hls_bp_master hb where hb.bp_code = t.bp_code_tenant
      and hb.bp_code in ('C00010186',
      'C00010185',
      'C00010181',
      'C00010174',
      'C00010184',
      'C00010182',
      'C00010168',
      'C00010191',
      'C00010170',
      'C00010188',
      'C00010169',
      'C00010197',
      'C00010193',
      'C00010189',
      'C00010194',
      'C00010171'))
      or decode(${/session/@user_id}, 10620, 1, 2) = 2)"/>
      </bm:data-filters>
      </bm:model>
      src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm
      View file @ ad90b6e8
      ......@@ -175,7 +175,26 @@
      AND a1.trx_category = a2.trx_category
      AND a2.authorized_user_id = ${/session/@user_id}
      AND trunc(SYSDATE) BETWEEN a2.start_date AND
      nvl(a2.end_date, trunc(SYSDATE))))) t1
      nvl(a2.end_date, trunc(SYSDATE))))
      And (decode(${/session/@user_id}, 10620, 1, 2) = 1
      And exists (select 1 from hls_bp_master hb where hb.bp_id = cc.bp_id_agent_level1
      And hb.bp_code in ('C00010186',
      'C00010185',
      'C00010181',
      'C00010174',
      'C00010184',
      'C00010182',
      'C00010168',
      'C00010191',
      'C00010170',
      'C00010188',
      'C00010169',
      'C00010197',
      'C00010193',
      'C00010189',
      'C00010194',
      'C00010171'))
      or decode(${/session/@user_id}, 10620, 1, 2) = 2) ) t1
      #WHERE_CLAUSE#
      ......
      src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm
      View file @ ad90b6e8
      ......@@ -126,6 +126,25 @@
      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}, 10620, 1, 2) = 1
      and exists (select 1 from hls_bp_master hb where hb.bp_id = t1.bp_id
      and hb.bp_code in ('C00010186',
      'C00010185',
      'C00010181',
      'C00010174',
      'C00010184',
      'C00010182',
      'C00010168',
      'C00010191',
      'C00010170',
      'C00010188',
      'C00010169',
      'C00010197',
      'C00010193',
      'C00010189',
      'C00010194',
      'C00010171'))
      or decode(${/session/@user_id}, 10620, 1, 2) = 2)"/>
      </bm:data-filters>
      <bm:query-fields>
      <bm:query-field name="query_amount_flag" queryExpression="((${@query_amount_flag}='1' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0) )or(${@query_amount_flag}='2' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) =0) )or (${@query_amount_flag}='3' and ((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >=0)))"/>
      ......
      src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
      View file @ ad90b6e8
      ......@@ -1252,6 +1252,11 @@
      Ext.fly('hls_fin_calculator_export_grid_id_wrap').setStyle({
      display: 'none'
      });
      if('${/parameter/@document_category}' == 'PROJECT' ||　'${/parameter/@document_category}' == 'CONTRACT' ){
      Ext.fly('hls_hls500_user_button3_col_id').setStyle({
      display: 'none'
      });
      }
      });
      function hls_hls500_import() {
      ......
      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