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

src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_project_history_display.lwm

@@ -9,10 +9,58 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-      select * from(
-       select *
-       FROM con_contract_history_lv t1
-       WHERE t1.bp_id = ${@bp_id} )tt
+--代理店权限(自然人)
+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 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#
             ]]></bm:query-sql>
         </bm:operation>

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -460,7 +460,6 @@
                 }
             //add by xsh35973 调整后不为默认值高亮显示
             //调整后逾期罚息
-            debugger;
             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(record.get('document_type')=='REPUR_CHAG'|| record.get('document_type')=='ET_CHAG'){
@@ -887,10 +886,12 @@
                 $(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');
             if(ds.id == lease_ds_id&&lease_ds_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('machine_number');
                 }else {