Commit 6d71e69d authored by 38823's avatar 38823

报单和合同历史数据查询优化

parent 6564e8b4
...@@ -9,10 +9,58 @@ ...@@ -9,10 +9,58 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * from( --代理店权限(自然人)
select * select *
FROM con_contract_history_lv t1 from con_contract_history_lv t
WHERE t1.bp_id = ${@bp_id} )tt where t.bp_class = 'NP'
and t.Id_Card_No =
(select hbm.id_card_no from hls_bp_master hbm where hbm.bp_id = ${@bp_id})
and t.unit_id in (select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id})
and exists(
select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
)
union all
select *
from con_contract_history_lv t
where t.bp_class = 'NP'
and t.Id_Card_No =
(select hbm.id_card_no from hls_bp_master hbm where hbm.bp_id = ${@bp_id})
and not exists(
select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
)
union all
--非代理店(自然人)
select *
from con_contract_history_lv t
where t.bp_class = 'ORG'
and t.social_code = (select hbm.social_code
from hls_bp_master hbm
where hbm.bp_id = ${@bp_id})
and t.unit_id =
(select hbm.unit_id from hls_bp_master hbm where hbm.bp_id = ${@bp_id})
union all
--代理店(法人)
select *
from con_contract_history_lv t
where t.bp_class = 'ORG'
and t.social_code = (select hbm.social_code
from hls_bp_master hbm
where hbm.bp_id = ${@bp_id})
and t.unit_id in (select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id})
and not exists(
select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
)
union all
--非代理店(法人)
select *
from con_contract_history_lv t
where t.bp_class = 'ORG'
and t.social_code = (select hbm.social_code
from hls_bp_master hbm
where hbm.bp_id = ${@bp_id})
and not exists(
select vv.unit_id from exp_emp_assign_e_v vv where vv.user_id = ${/session/@user_id} and vv.POSITION_TYPE = 'SALES'
)
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
...@@ -461,7 +461,6 @@ ...@@ -461,7 +461,6 @@
} }
//add by xsh35973 调整后不为默认值高亮显示 //add by xsh35973 调整后不为默认值高亮显示
//调整后逾期罚息 //调整后逾期罚息
debugger;
var ds_id_req = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req'); var ds_id_req = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_change_req');
if (ds_id_req == ds.id && ds_id_req) { if (ds_id_req == ds.id && ds_id_req) {
if(record.get('document_type')=='REPUR_CHAG'|| record.get('document_type')=='ET_CHAG'){ if(record.get('document_type')=='REPUR_CHAG'|| record.get('document_type')=='ET_CHAG'){
...@@ -892,10 +891,12 @@ ...@@ -892,10 +891,12 @@
$(ds_id).query(); $(ds_id).query();
} }
} }
debugger;
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item'); var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){ if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id'; var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70' || record.data.division=='92'){ var division =$(project_ds_id).getAt(0).get('division');
if(division=='70' || division=='92'){
$(gridId).hideColumn('full_name'); $(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number'); $(gridId).hideColumn('machine_number');
}else { }else {
......
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