Skip to content

L
leaf-hlcm
Commit b038588a authored by congzhao's avatar congzhao
Browse files
Options

Merge remote-tracking branch 'origin/feature/建机电子合同开发' into 建机电子合同开发

parents ea2688bb 2eeecc5c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 122 deletions
src/main/webapp/WEB-INF/classes/wx/WX100/con_contract_list_query.lwm
View file @ b038588a
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * select *
from (select t1.contract_id, from (select t1.contract_id,
t1.ele_flow_id,
t1.contract_number, t1.contract_number,
t1.bp_id_tenant, t1.bp_id_tenant,
(select hm.bp_name (select hm.bp_name
...@@ -33,123 +32,9 @@ ...@@ -33,123 +32,9 @@
from sys_code_values_v v from sys_code_values_v v
where v.code = decode(t1.sign_type, where v.code = decode(t1.sign_type,
'PAPER_SIGN', 'PAPER_SIGN',
'PAPER_SIGN_STATUS', 'CON_PAPER_SIGN_STATUS',
'ELE_SIGN', 'ELE_SIGN',
'ELE_SIGN_STATUS') 'CON_ELE_SIGN_STATUS')
and v.code_enabled_flag = 'Y'
and v.code_value = t1.contract_status
and v.code_value_enabled_flag = 'Y') AS contract_status_n,
(select ci.modelcd
from con_contract_lease_item ci
where ci.contract_id = t1.contract_id
and ci.equipment_type = 'MAIN') modelcd, --机型
to_char(t1.lease_start_date, 'yyyy-mm-dd') lease_start_date, --合同开始日期
(select to_char(ccc.due_date,'yyyy-MM-dd') from con_contract_cashflow ccc
where ccc.contract_id = t1.contract_id
and ((ccc.cf_item = 1 and ccc.cf_type in (1,200,250)) or (ccc.cf_item = 11 and ccc.cf_type =11)
or (ccc.cf_item = 8 and ccc.cf_type = 8) or (ccc.cf_item = 9 and ccc.cf_type = 9))
and ccc.cf_direction = 'INFLOW'
and ccc.cf_status = 'RELEASE'
and ccc.times = (select max(cc.times) from con_contract_cashflow cc where cc.contract_id = ccc.contract_id
and ((cc.cf_item = 1 and cc.cf_type in (1,200,250)) or (cc.cf_item = 11 and cc.cf_type =11)
or (cc.cf_item = 8 and cc.cf_type = 8) or (cc.cf_item = 9 and cc.cf_type = 9))
and cc.cf_direction = 'INFLOW'
and cc.cf_status = 'RELEASE')
and rownum =1) lease_end_date, --合同结束日期
(select to_char(cc.due_date, 'dd')
from con_contract_cashflow cc
where cc.contract_id = t1.contract_id
and cc.times = 1
and cc.cf_item = '1'
and rownum = 1) due_day, --还款日
(NVL(t1.down_payment, 0) + NVL(t1.residual_value, 0) +
NVL(t1.total_rental, 0)) total_sign, --总金额
t1.bank_branch_num, --还款银行账号
t1.bank_account_name, --还款账户名称
(select ba.bank_full_name
from hls_bp_master_bank_account ba
where ba.bank_account_id = t1.bank_account_id) bank_full_name, --还款银行名称
t1.lease_times, --期数
(select to_char(sum(cc.due_amount), 'FM9,999,999,999,990.00')
from con_contract_cashflow cc
where cc.contract_id = t1.contract_id
and ((cc.cf_item = 1 and cc.cf_type in (1,200,250)) or (cc.cf_item = 11 and cc.cf_type =11)
or (cc.cf_item = 8 and cc.cf_type = 8) or (cc.cf_item = 9 and cc.cf_type = 9))
and cc.cf_direction = 'INFLOW'
and cc.cf_status = 'RELEASE') due_amount_all --应还总额
from con_contract t1, con_contract_change_req cr
where t1.data_class = 'NORMAL'
and t1.sign_contract_status = decode(t1.contract_status,'NEW','SIGN',t1.sign_contract_status)
and t1.contract_id = cr.contract_id
and t1.contract_status in
(select v.code_value
from sys_code_values_v v
where v.code = decode(t1.sign_type,
'PAPER_SIGN',
'PAPER_SIGN_STATUS',
'ELE_SIGN',
'ELE_SIGN_STATUS')
and v.code_enabled_flag = 'Y'
and v.code_value_enabled_flag = 'Y')
and ((${@account_type} = 'PE' and exists
(select 1
from con_contract_bp ccb, hls_bp_master hb
where ccb.bp_id = hb.bp_id
and ccb.contract_id = t1.contract_id
and (ccb.bp_category in ('TENANT', 'GUARANTOR') and (ccb.id_card_no = ${@id_no} or ccb.id_no_sp = ${@id_no}))))
or (${@account_type} = 'AG' and exists
(select 1
from hls_bp_master_signer hs
where hs.hls_bp_signer_id = t1.signer
and hs.id_card = ${@id_no}))
or (${@account_type} = 'AG' and exists
(select 1
from con_contract_bp cb
where cb.contract_id = t1.contract_id
and cb.bp_category = 'GUARANTOR'
and cb.bp_class = 'ORG'
and cb.id_card_no_leg = ${@id_no}))
or (${@account_type} = 'LP' and exists
(select 1
from con_contract_bp cb, hls_bp_master hb
where cb.bp_id = hb.bp_id
and cb.contract_id = t1.contract_id
and hb.social_code = ${@id_no})))
union
select t1.contract_id,
t1.ele_flow_id,
t1.contract_number,
t1.bp_id_tenant,
(select hm.bp_name
from hls_bp_master hm
where hm.bp_id = t1.bp_id_tenant) bp_id_tenant_n,
(select hm.id_card_no
from hls_bp_master hm
where hm.bp_id = t1.bp_id_tenant) id_card_no_tenant,
(select hm.bp_class
from hls_bp_master hm
where hm.bp_id = t1.bp_id_tenant) bp_id_tenant_type,
t1.bp_id_agent_level1,
(select hm.bp_name
from hls_bp_master hm
where hm.bp_id = t1.bp_id_agent_level1) bp_id_agent_level1_n,
(select hm.id_card_no_leg
from hls_bp_master hm
where hm.bp_id = t1.bp_id_agent_level1) id_card_no_agent,
(SELECT i.machine_number
FROM con_contract_lease_item i
WHERE i.contract_id = t1.contract_id
AND i.equipment_type = 'MAIN') machine_number, --机号
t1.contract_status,
(select v.code_value_name
from sys_code_values_v v
where v.code = decode(t1.sign_type,
'PAPER_SIGN',
'PAPER_SIGN_STATUS',
'ELE_SIGN',
'ELE_SIGN_STATUS')
and v.code_value = t1.contract_status and v.code_value = t1.contract_status
and v.code_enabled_flag = 'Y' and v.code_enabled_flag = 'Y'
and v.code_value_enabled_flag = 'Y') AS contract_status_n, and v.code_value_enabled_flag = 'Y') AS contract_status_n,
...@@ -200,9 +85,9 @@ select t1.contract_id, ...@@ -200,9 +85,9 @@ select t1.contract_id,
from sys_code_values_v v from sys_code_values_v v
where v.code = decode(t1.sign_type, where v.code = decode(t1.sign_type,
'PAPER_SIGN', 'PAPER_SIGN',
'PAPER_SIGN_STATUS', 'CON_PAPER_SIGN_STATUS',
'ELE_SIGN', 'ELE_SIGN',
'ELE_SIGN_STATUS') 'CON_ELE_SIGN_STATUS')
and v.code_enabled_flag = 'Y' and v.code_enabled_flag = 'Y'
and v.code_value_enabled_flag = 'Y') and v.code_value_enabled_flag = 'Y')
and ((${@account_type} = 'PE' and exists and ((${@account_type} = 'PE' and exists
...@@ -236,7 +121,6 @@ select t1.contract_id, ...@@ -236,7 +121,6 @@ select t1.contract_id,
</bm:operations> </bm:operations>
<bm:fields> <bm:fields>
<bm:field name="contract_id"/> <bm:field name="contract_id"/>
<bm:field name="ele_flow_id"/>
<bm:field name="contract_number"/> <bm:field name="contract_number"/>
<bm:field name="bp_id_tenant_n"/> <bm:field name="bp_id_tenant_n"/>
<bm:field name="bp_id_tenant_type"/> <bm:field name="bp_id_tenant_type"/>
......
src/main/webapp/modules/wx/WX100/con_bp_master_query.lsc
View file @ b038588a
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
var existsFlag_map; var existsFlag_map;
var existsFlag; var existsFlag;
try { try {
var existsFlag_query = $bm('wx.WX100.con_contract_query'); var existsFlag_query = $bm('wx.WX100.con_bp_master_query');
existsFlag_map = existsFlag_query.queryAsMap({ existsFlag_map = existsFlag_query.queryAsMap({
social_code:$ctx.parameter.idNo, social_code:$ctx.parameter.idNo,
bp_name:$ctx.parameter.name, bp_name:$ctx.parameter.name,
......
src/main/webapp/modules/wx/WX100/con_contract_list_query.lsc
View file @ b038588a
...@@ -92,7 +92,6 @@ ...@@ -92,7 +92,6 @@
} }
Contracts.push({ Contracts.push({
"contractNo": contract_list_detail.contract_id, "contractNo": contract_list_detail.contract_id,
"flowId": contract_list_detail.ele_flow_id,
"contractNumber": contract_list_detail.contract_number, "contractNumber": contract_list_detail.contract_number,
"telentName": contract_list_detail.bp_id_tenant_n, "telentName": contract_list_detail.bp_id_tenant_n,
"telentType":contract_list_detail.bp_id_tenant_type, "telentType":contract_list_detail.bp_id_tenant_type,
......
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