Commit 122a1667 authored by 陆正友's avatar 陆正友

租金催收

parent f0d9a374
......@@ -160,7 +160,7 @@
FROM con_contract cc
WHERE
cc.contract_status='REPURING'
and cc.repurchase_types='STAGE_REPURCHASE'
and cc.repurchase_types in ('STAGE_REPURCHASE','ONE_TIME_REPURCHASE')
and EXISTS(SELECT 1
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
......@@ -182,13 +182,13 @@
AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE))))
And ((decode(${/session/@user_id}, 10600, 1, 2) = 1
And ((decode((SELECT user_name FROM sys_user a WHERE a.user_id = ${/session/@user_id}), 'DYLJJ', 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
('D00000028', 'D00000035', 'D00000016', 'D00000021', 'D00000039', 'D00000025', 'D00000034', 'D00000017', 'D00000018', 'D00000024', 'D00000032', 'D00000009', 'D00000012', 'D00000014', 'D00000015', 'D00000023')))
or (decode(${/session/@user_id}, 10600, 1, 2) = 2))
or (decode((SELECT user_name FROM sys_user a WHERE a.user_id = ${/session/@user_id}), 'DYLJJ', 1, 2) = 2))
and nvl(division,'-1') not IN ('70','92')
union all
......@@ -333,7 +333,7 @@
FROM con_contract cc
WHERE
cc.contract_status='REPURING'
and cc.repurchase_types='STAGE_REPURCHASE'
and cc.repurchase_types in ('STAGE_REPURCHASE','ONE_TIME_REPURCHASE')
and EXISTS(SELECT 1
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
......@@ -355,13 +355,13 @@
AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE))))
And ((decode(${/session/@user_id}, 10600, 1, 2) = 1
And ((decode((SELECT user_name FROM sys_user a WHERE a.user_id = ${/session/@user_id}), 'DYLJJ', 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
('D00000028', 'D00000035', 'D00000016', 'D00000021', 'D00000039', 'D00000025', 'D00000034', 'D00000017', 'D00000018', 'D00000024', 'D00000032', 'D00000009', 'D00000012', 'D00000014', 'D00000015', 'D00000023')))
or (decode(${/session/@user_id}, 10600, 1, 2) = 2)) and nvl(division,'-1') IN ('70','92')
or (decode((SELECT user_name FROM sys_user a WHERE a.user_id = ${/session/@user_id}), 'DYLJJ', 1, 2) = 2)) and nvl(division,'-1') IN ('70','92')
) t1
......@@ -422,6 +422,7 @@
<bm:query-field name="lease_organization" queryExpression="t1.lease_organization = ${@lease_organization}"/>
<bm:query-field name="business_type_n" queryExpression="t1.business_type = ${@business_type}"/>
<bm:query-field name="send_message" queryExpression="t1.send_message = ${@send_message}"/>
<bm:query-field name="repurchase_types" queryExpression="t1.repurchase_types = ${@repurchase_types}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
......
......@@ -28,8 +28,6 @@
function CON601_con_contract_query() {
$('CON620_contract_result_ds').query();
$('CON620_contract_repur_result_ds').query();
$('con620_one_time_repurchase_result_ds').query();
}
function CON601_con_contract_reset() {
......@@ -381,9 +379,7 @@
function CON601_dun_msg_money() {
var records = $('CON620_contract_result_ds').getSelected();
var records_repur = $('CON620_contract_repur_result_ds').getSelected();
var records_repur_one = $('con620_one_time_repurchase_result_ds').getSelected();
if (records_repur.length > 0||records_repur_one.length > 0) {
if (records_repur.length > 0) {
$L.showInfoMessage('提示', '解约回购合同不在催收短信发送范围!');
return;
}
......@@ -465,8 +461,7 @@
function CON601_dun_msg_no_money() {
var records = $('CON620_contract_result_ds').getSelected();
var records_repur = $('CON620_contract_repur_result_ds').getSelected();
var records_repur_one = $('con620_one_time_repurchase_result_ds').getSelected();
if (records_repur.length > 0||records_repur_one.length > 0) {
if (records_repur.length > 0) {
$L.showInfoMessage('提示', '解约回购合同不在催收短信发送范围!');
return;
}
......@@ -569,6 +564,7 @@
<a:record code_value="LEASEOPERAT" code_value_name="经营性租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="repurchase_types_ds" lookupCode="REPURCHASE_TYPES"/>
<a:dataSet id="CON601_lease_organization_name_ds" loadData="true"
model="basic.hls_lease_organization_for_lov"/>
<a:dataSet id="con620_send_message_ds" lookupCode="SEND_MESSAGE"/>
......@@ -605,6 +601,8 @@
<a:field name="send_message"/>
<a:field name="send_message_n" displayField="code_value_name" options="con620_send_message_ds"
returnField="send_message" valueField="code_value"/>
<a:field name="repurchase_types_n" displayField="code_value_name" options="repurchase_types_ds"
returnField="repurchase_types" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="CON620_contract_result_ds" autoPageSize="true" autoQuery="true"
......@@ -624,12 +622,6 @@
queryUrl="${/request/@context_path}/autocrud/cont.CON620.con_contract_dun_for_repur_query/query"
selectable="true" selectionModel="multiple">
</a:dataSet>
<!--<a:dataSet id="bgt_contract_payment_detail_line_ds" fetchAll="true" model="cont.CON620.bgt_contract_payment_detail_line"/>-->
<a:dataSet id="con620_one_time_repurchase_result_ds" autoPageSize="true" autoQuery="true"
model="cont.CON620.con_contract_dun_for_repur_one_time_query" queryDataSet="CON620_contract_query_ds"
queryUrl="${/request/@context_path}/autocrud/cont.CON620.con_contract_dun_for_repur_one_time_query/query"
selectable="true" selectionModel="multiple">
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
......@@ -652,6 +644,7 @@
<a:textField name="bp_id_tenant_desc" bindTarget="CON620_contract_query_ds"
prompt="HLS.TENANT_CODE"/>
<a:textField name="bp_id_agent_desc" bindTarget="CON620_contract_query_ds" prompt="代理店"/>
<a:comboBox name="repurchase_types_n" bindTarget="CON620_contract_query_ds" prompt="回购类型"/>
<a:comboBox name="business_type_n" bindTarget="CON620_contract_query_ds" prompt="业务类型"/>
<a:comboBox name="division_n" bindTarget="CON620_contract_query_ds" prompt="租赁物"/>
<a:numberField name="business_due_days_from" bindTarget="CON620_contract_query_ds"
......@@ -787,7 +780,7 @@
</a:columns>
</a:grid>
</a:tab>
<a:tab prompt="分期回购逾期租金" width="130" id="repur_select_id" tabClassName="repur_class" >
<a:tab prompt="解约回购逾期租金" width="130" id="repur_select_id" tabClassName="repur_class" >
<a:grid id="CON620_contract_repur_result_grid_ds" bindTarget="CON620_contract_repur_result_ds"
marginHeight="215"
marginWidth="50" navBar="true" >
......@@ -853,50 +846,6 @@
</a:columns>
</a:grid>
</a:tab>
<a:tab prompt="一次性回购逾期租金" width="130" >
<a:grid id="CON620_contract_repur_result_one_rid_ds" bindTarget="con620_one_time_repurchase_result_ds"
marginHeight="215"
marginWidth="50" navBar="true" >
<a:columns>
<a:column name="bp_id_agent_desc" align="center" prompt="代理店" lock="true" width="100"/>
<a:column name="contract_number" lock="true" prompt="HLS.CONTRACT_NUMBER"
renderer="CON620_render_contract_dun_grid" width="100"/>
<a:column name="bp_id_tenant_desc" lock="true" prompt="承租人名称" showTitle="true"
width="100"
align="center"/>
<a:column name="min_overdue_date" align="center" prompt="预定支付日" width="100"
renderer="render_formatDate"/>
<a:column name="min_overdue_times" align="center" prompt="预定支付期数" width="100"/>
<a:column prompt="营业">
<a:column name="business_due_times" align="center" prompt="逾期期数"
width="100"/>
<a:column name="business_due_days" align="center" prompt="逾期天数"
width="100"/>
<a:column name="business_due_amount" align="right" prompt="逾期金额"
renderer="CON620_render_contract_dun_grid"
footerRenderer="summaryRenderer"
width="100"/>
<a:column name="over_due_amount" align="right" prompt="违约金"
renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
<a:column name="business_received_amount" align="right" prompt="已收租金"
renderer="CON620_render_contract_dun_grid"
footerRenderer="summaryRenderer"
width="100"/>
<a:column name="business_unreceived_amount" align="right" prompt="未收租金"
renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
</a:column>
<a:column name="business_type_n" align="center" prompt="业务类型" width="60"/>
<a:column name="division_n" align="center" prompt="租赁物" width="120"/>
<a:column name="modelcd" align="center" prompt="机型" width="100"/>
<a:column name="machine_number" align="center" prompt="机器号码" width="100"/>
<a:column name="send_message_n" align="center" prompt="发送催收短信" width="120"/>
<a:column name="dun_date" align="center" prompt="催收短信发送日期" width="120"/>
</a:columns>
</a:grid>
</a:tab>
</a:tabs>
</a:tabPanel>
</a:screenBody>
......
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