Skip to content

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

Merge branch 'feature/凭证明细查看' into develop

parents 026e1e52 eb5269f7
Hide whitespace changes
Inline Side-by-side
Showing with 951 additions and 225 deletions
.gitignore
View file @ 8a35362a
......@@ -23,8 +23,8 @@ overlays/
*~pck
# common config rename
uncertain.local.xml
config.properties
# uncertain.local.xml
# onfig.properties
atm_upload.svc
atm_upload_unUseSubFolder.svc
src/main/resources/config.properties 0 → 100644
View file @ 8a35362a
redis.sentinel=\
10.86.20.183:26379,\
10.86.20.184:26379
# if redis.useSentinel is true, then redis.ip and redis.port is useless
# this value should always be true except local dev test
redis.useSentinel=false
redis.ip=127.0.0.1
redis.port=6379
redis.db=10
#db.jndiName=java:comp/env/jdbc/hap_dev
# db.type property is used for activiti
#db.type=mysql
db.type=oracle
db.driverClassName=oracle.jdbc.driver.OracleDriver
db.url=jdbc:oracle:thin:@10.200.17.100:1521:HLS
db.username=hl_cm_dev
db.password=hl_cm_dev
db.maxLifetime=600000
db.maxPoolSize=100
db.minIdle=10
#db.type=mssql
#db.type=hana
#mybatis.identity=JDBC
mybatis.identity=SEQUENCE
# environment
env.code=SIT
#Document history
data.backup = false
data.backup.filePath=e:\\hand
# SIT
# job
job.autoStartup=true
# build number
project.buildDate=${project.buildDate}
# CAS
cas.service=http://localhost:8080/hap/login/cas
cas.ssoserver.loginurl=https://login.hand-china.com/sso/login
cas.ssoserver.url=https://login.hand-china.com/sso
cas.ssoserver.logouturl=https://login.hand-china.com/sso/logout?service=http://localhost:8080/hap
# LDAP
ldap.server.url=ldap://localhost:389/
ldap.conn.userDn=cn=Manager,dc=hand,dc=com
ldap.conn.password=secret
ldap.user.search.base=dc=hand,dc=com
ldap.user.search.filter=(uid={0})
# REDISSON
# multiple redis such as
# redisson.server.url=\
# 127.0.0.1:6379,\
# 10.211.103.142:6379
# redisson.server.url=
# redissson.server.password=
# Activiti MailServer
activiti.mailServerHost=smtp.126.com
activiti.mailServerPort=25
activiti.mailServerUsername=hap_dev@126.com
activiti.mailServerPassword=hapdev11
# Message-Redis
message.provider=redis
# Message-RabbitMQ
#message.provider=rabbitmq
#rabbitmq.host=localhost
#rabbitmq.username=guest
#rabbitmq.password=guest
#rabbitmq.port=5672
hlsv3.plugin.enabled=true
# sso login flag
ssoLoginFlag=true
#Electronic Invoice Interface wsdl url
acr.webservice.url=
#Electronic Invoice Interface TaxNumber
acr.saleTax=
#pdf download link
acr.pdfAddress = D:/u01/
#Paper invoice interface wsdl url
paper.webservice.url =
#onlyoffice
files.docservice.timeout=120000
files.docservice.host.url=http://127.0.0.1:8082/hlcm
files.docservice.enableAccessControl=false
files.docservice.url=http://127.0.0.1:8765
#Log in to the AES key
aes.key=1vgH5678GH3a1678
#Industrial and Commercial Bank Interface
icbc.signUrl=
icbc.submitUrl=
#Generic log storage address
hls.interface.log=/u01/logs
#Leaf frame version
leaf.version=1.0
leaf.logDebuggerModel=true
session.filter.excludePattern=
#layout config
layout.gridButtonIgnoreReadModel=false
\ No newline at end of file
src/main/resources/profiles/dev/config.properties 0 → 100644
View file @ 8a35362a
redis.sentinel=\
10.86.20.183:26379,\
10.86.20.184:26379
# if redis.useSentinel is true, then redis.ip and redis.port is useless
# this value should always be true except local dev test
redis.useSentinel=false
redis.ip=localhost
redis.port=6379
redis.db=2
#db.jndiName=java:comp/env/jdbc/hap_dev
# db.type property is used for activiti
#db.type=mysql
db.type=oracle
db.driverClassName=oracle.jdbc.driver.OracleDriver
db.url=jdbc:oracle:thin:@10.200.17.100:1521:HLS
db.username=hl_cm_dev
db.password=hl_cm_dev
db.maxLifetime=600000
db.maxPoolSize=100
db.minIdle=10
#db.type=mssql
#db.type=hana
#mybatis.identity=JDBC
mybatis.identity=SEQUENCE
# environment
env.code=SIT
#Document history
data.backup = false
data.backup.filePath=e:\\hand
# SIT
# job
job.autoStartup=true
# build number
project.buildDate=${project.buildDate}
# CAS
cas.service=http://localhost:8080/hap/login/cas
cas.ssoserver.loginurl=https://login.hand-china.com/sso/login
cas.ssoserver.url=https://login.hand-china.com/sso
cas.ssoserver.logouturl=https://login.hand-china.com/sso/logout?service=http://localhost:8080/hap
# LDAP
ldap.server.url=ldap://localhost:389/
ldap.conn.userDn=cn=Manager,dc=hand,dc=com
ldap.conn.password=secret
ldap.user.search.base=dc=hand,dc=com
ldap.user.search.filter=(uid={0})
# REDISSON
# multiple redis such as
# redisson.server.url=\
# 127.0.0.1:6379,\
# 10.211.103.142:6379
# redisson.server.url=
# redissson.server.password=
# Activiti MailServer
activiti.mailServerHost=smtp.126.com
activiti.mailServerPort=25
activiti.mailServerUsername=hap_dev@126.com
activiti.mailServerPassword=hapdev11
# Message-Redis
message.provider=redis
# Message-RabbitMQ
#message.provider=rabbitmq
#rabbitmq.host=localhost
#rabbitmq.username=guest
#rabbitmq.password=guest
#rabbitmq.port=5672
hlsv3.plugin.enabled=true
# sso login flag
ssoLoginFlag=true
#Electronic Invoice Interface wsdl url
acr.webservice.url=
#Electronic Invoice Interface TaxNumber
acr.saleTax=
#pdf download link
acr.pdfAddress = D:/u01/
#Paper invoice interface wsdl url
paper.webservice.url =
#onlyoffice
files.docservice.timeout=120000
files.docservice.host.url=http://127.0.0.1:8082/hlcm
files.docservice.enableAccessControl=false
files.docservice.url=http://127.0.0.1:8765
#Log in to the AES key
aes.key=1vgH5678GH3a1678
#Industrial and Commercial Bank Interface
icbc.signUrl=
icbc.submitUrl=
#Generic log storage address
hls.interface.log=/u01/logs
#Leaf frame version
leaf.version=1.0
# session.filter.excludePattern=
layout.gridButtonIgnoreReadModel=true
leaf.logDebuggerModel=true
\ No newline at end of file
src/main/webapp/WEB-INF/classes/cont/CON3300/contract_item_report_query.lwm
View file @ 8a35362a
......@@ -243,7 +243,83 @@
to_char(to_date(${@base_date}, 'yyyy-mm-dd'), 'yyyymm')),0) future_principal,
'0' unexecute_total,
--未来应收
'0' this_due_amount
'0' this_due_amount,
-- add by liyuan.chen
(select hb.bp_code from hls_bp_master hb where hb.bp_id = t.bp_id_agent_level1) as bp_agent_code,
(select hb.bp_name from hls_bp_master hb where hb.bp_id = t.bp_id_agent_level1) as bp_agent_name,
--当期利息
nvl((SELECT SUM(nvl(ccc.net_interest, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id =
contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
p_calc_date => to_date(${@base_date},
'yyyy-mm-dd'))
AND cf_item IN(1,200,250)
AND ccc.cf_status = 'RELEASE'
AND to_char(ccc.due_date, 'yyyymm') =
to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
'yyyymm')),
0)+
NVL((SELECT nvl(ccc.net_due_amount, 0)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id =
contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
p_calc_date => to_date(${@base_date},
'yyyy-mm-dd'))
AND ccc.cf_item = 8
AND ccc.cf_status = 'RELEASE'
AND to_char(ccc.due_date, 'yyyymm') =
to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
'yyyymm')),0) net_this_interest,
--当次累计利息
nvl((SELECT SUM(nvl(ccc.net_interest, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id =
contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
p_calc_date => to_date(${@base_date},
'yyyy-mm-dd'))
AND cf_item IN( 1,200,250)
AND ccc.cf_status = 'RELEASE'
AND to_char(ccc.due_date, 'yyyymm') <=
to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
'yyyymm')),
0)+NVL((SELECT nvl(ccc.net_due_amount, 0)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id =
contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
p_calc_date => to_date(${@base_date},
'yyyy-mm-dd'))
AND ccc.cf_item = 8
AND ccc.cf_status = 'RELEASE'
AND to_char(ccc.due_date, 'yyyymm') <=
to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
'yyyymm')),0) net_this_add_interest,
--未执行利息
'0' net_unexecute_interest,
--未来应收利息
nvl((SELECT SUM(nvl(ccc.net_interest, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id =
contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
p_calc_date => to_date(${@base_date},
'yyyy-mm-dd'))
AND cf_item IN ( 1,200,250)
AND ccc.cf_status = 'RELEASE'
AND to_char(ccc.due_date, 'yyyymm') >
to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
'yyyymm')),
0)+NVL((SELECT nvl(ccc.net_due_amount, 0)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id =
contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
p_calc_date => to_date(${@base_date},
'yyyy-mm-dd'))
AND ccc.cf_item = 8
AND ccc.cf_status = 'RELEASE'
AND to_char(ccc.due_date, 'yyyymm') >
to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
'yyyymm')),0) net_future_interest
FROM con_contract t
WHERE t.data_class = 'NORMAL'
AND t.contract_status NOT IN('CANCEL', 'NEW', 'INCEPTING', 'INCEPT_RETURN')
......
src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_received_amount.lwm
View file @ 8a35362a
......@@ -15,6 +15,9 @@
(SELECT tp.description
FROM hls_cashflow_type tp
WHERE tp.cf_type = t.cf_type) cf_type_dis,
t.CF_ITEM,
(SELECT tc.description FROM HLS_CASHFLOW_ITEM tc WHERE tc.CF_ITEM = t.CF_ITEM
) cf_item_dis,
nvl(t.due_amount,0) due_amount,
nvl(t.received_amount,0) received_amount,
to_char(t.due_date,'yyyy-mm-dd') due_date,
......
src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_unreceived_amount.lwm
View file @ 8a35362a
......@@ -14,6 +14,9 @@
t.cf_type,
(SELECT tp.description FROM hls_cashflow_type tp WHERE tp.cf_type = t.cf_type
) cf_type_dis,
t.CF_ITEM,
(SELECT tc.description FROM HLS_CASHFLOW_ITEM tc WHERE tc.CF_ITEM = t.CF_ITEM
) cf_item_dis,
nvl(t.due_amount,0) due_amount,
nvl(t.received_amount,0) received_amount,
to_char(t.due_date,'yyyy-mm-dd') due_date,
......
src/main/webapp/WEB-INF/classes/cont/CON620/con_contract_dun_for_query.lwm
View file @ 8a35362a
......@@ -9,194 +9,260 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT *
FROM (SELECT cc.contract_id,
--cc.contract_name,
(SELECT pp.project_number
FROM prj_project pp
WHERE pp.project_id = cc.project_id) project_number,
cc.bp_id_tenant,
to_char(cc.inception_of_lease, 'yyyy-mm-dd') inception_of_lease,
(SELECT hb.bp_name
FROM hls_bp_master hb, con_contract_bp ccb
WHERE hb.bp_category = 'AGENT'
AND ccb.bp_category = 'AGENT'
AND hb.bp_id = ccb.bp_id
AND ccb.contract_id = cc.contract_id) agent_id_n,
(SELECT bp_name
FROM hls_bp_master
WHERE bp_id = cc.bp_id_tenant
AND enabled_flag = 'Y') bp_id_tenant_desc,
cc.contract_number,
cc.bp_id_agent_level1,
(SELECT extra_nam
FROM hls_bp_master
WHERE bp_id = cc.bp_id_agent_level1
AND enabled_flag = 'Y') bp_id_agent_desc,
cc.owner_user_id,
(SELECT description
FROM sys_user
WHERE user_id = cc.owner_user_id) owner_user_id_desc,
cc.lease_organization,
(SELECT description
FROM hls_lease_organization
WHERE lease_organization = cc.lease_organization
AND enabled_flag = 'Y') lease_organization_desc,
(SELECT a.description value_name
FROM hls_business_type_v a
WHERE a.enabled_flag = 'Y'
AND a.business_type = cc.business_type) business_type_n,
cc.data_class,
(SELECT hd.description
FROM hls_division hd
WHERE hd.enabled_flag = 'Y'
AND hd.division = cc.division) division_n,
cc.division,
contract_item_query_pkg.calc_ac_overdue_times(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) account_due_times,
contract_item_query_pkg.calc_ac_overdue_days(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) account_due_days,
SELECT
t1.*,
(Select Min(cc1.TIMES)
From con_contract_cashflow cc1
Where cc1.contract_id = t1.contract_id
And cc1.due_date <= Sysdate
And cc1.cf_item In (1, 8, 9)
And cc1.write_off_flag <> 'FULL'
And cc1.due_date = t1.min_overdue_date) min_overdue_times
FROM (SELECT
cc.contract_id,
cc.document_type,
cc.document_category,
--cc.contract_name,
(SELECT pp.project_number
FROM prj_project pp
WHERE pp.project_id = cc.project_id) project_number,
cc.bp_id_tenant,
to_char(cc.inception_of_lease, 'yyyy-mm-dd') inception_of_lease,
(SELECT hb.bp_name
FROM hls_bp_master hb, con_contract_bp ccb
WHERE hb.bp_category = 'AGENT'
AND ccb.bp_category = 'AGENT'
AND hb.bp_id = ccb.bp_id
AND ccb.contract_id = cc.contract_id) agent_id_n,
(SELECT bp_name
FROM hls_bp_master
WHERE bp_id = cc.bp_id_tenant
AND enabled_flag = 'Y') bp_id_tenant_desc,
cc.contract_number,
cc.bp_id_agent_level1,
(SELECT extra_nam
FROM hls_bp_master
WHERE bp_id = cc.bp_id_agent_level1
AND enabled_flag = 'Y') bp_id_agent_desc,
cc.owner_user_id,
(SELECT description
FROM sys_user
WHERE user_id = cc.owner_user_id) owner_user_id_desc,
cc.lease_organization,
(SELECT description
FROM hls_lease_organization
WHERE lease_organization = cc.lease_organization
AND enabled_flag =
'Y') lease_organization_desc,
(SELECT a.description value_name
FROM hls_business_type_v a
WHERE a.enabled_flag = 'Y'
AND a.business_type = cc.business_type) business_type_n,
cc.data_class,
(SELECT hd.description
FROM hls_division hd
WHERE hd.enabled_flag = 'Y'
AND hd.division = cc.division) division_n,
cc.division,
/*contract_item_query_pkg.calc_ac_overdue_times(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) account_due_times,
contract_item_query_pkg.calc_ac_overdue_days(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) account_due_days,*/
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
AND trunc(ccc.due_date) <= trunc(SYSDATE)) -
nvl((SELECT SUM(nvl(gwo.write_off_amount, 0))
FROM gld_write_off gwo ,con_contract_cashflow ccw
WHERE gwo.reversed_flag = 'N'
AND gwo.contract_id = cc.contract_id
AND gwo.cf_item IN (1, 8, 250)
and gwo.cf_item =ccw.cf_item
and gwo.times =ccw.times
and gwo.contract_id =ccw.contract_id
AND trunc(ccw.due_date) <= trunc(SYSDATE)),0) account_due_amount,
contract_item_query_pkg.calc_business_overdue_times(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_times,
contract_item_query_pkg.calc_bussiness_overdue_days(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_days,
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
AND trunc(ccc.due_date) <= trunc(SYSDATE)) -
nvl((SELECT SUM(nvl(gwo.write_off_amount, 0))
FROM gld_write_off gwo, con_contract_cashflow ccw
WHERE gwo.reversed_flag = 'N'
AND gwo.contract_id = cc.contract_id
AND gwo.cf_item IN (1, 8, 250)
and gwo.cf_item = ccw.cf_item
and gwo.times = ccw.times
and gwo.contract_id = ccw.contract_id
AND trunc(ccw.due_date) <= trunc(SYSDATE)), 0) account_due_amount,
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
AND trunc(ccc.due_date) <= trunc(SYSDATE)) -
nvl((SELECT SUM(nvl(cwo.write_off_due_amount, 0))
FROM csh_write_off cwo
WHERE cwo.reversed_flag = 'N'
AND cwo.contract_id = cc.contract_id
AND cwo.cf_item IN (1, 8, 250)
And Exists
(Select 1
From con_contract_cashflow cn
Where cn.cashflow_id = cwo.cashflow_id
And cn.cf_status = 'RELEASE'
And trunc(cn.due_date) <= trunc(Sysdate))),
0) business_due_amount, --营业逾期总金额
/*contract_item_query_pkg.calc_business_overdue_times(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_times,
contract_item_query_pkg.calc_bussiness_overdue_days(p_contract_id => cc.contract_id,
p_calc_date => SYSDATE,
p_user_id => -1) business_due_days,*/
(SELECT SUM(ccc.due_amount - nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_item = 9
AND ccc.write_off_flag <> 'FULL'
and ccc.cf_status = 'RELEASE') over_due_amount,
--营业最早逾期的预定支付日
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
AND trunc(ccc.due_date) <= trunc(SYSDATE)) -
nvl((SELECT SUM(nvl(cwo.write_off_due_amount, 0))
FROM csh_write_off cwo
WHERE cwo.reversed_flag = 'N'
AND cwo.contract_id = cc.contract_id
AND cwo.cf_item IN (1, 8, 250)
And Exists
(Select 1
From con_contract_cashflow cn
Where cn.cashflow_id = cwo.cashflow_id
And cn.cf_status = 'RELEASE'
And trunc(cn.due_date) <= trunc(Sysdate))),
0) business_due_amount,
--营业逾期总金额
(SELECT to_char(MIN(ccc.due_date),'yyyy-mm-dd')
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
--AND ccc.overdue_status = 'Y'
AND ccc.due_date <=sysdate
AND ccc.cf_item in(1,8,9)
AND ccc.write_off_flag <> 'FULL') min_overdue_date,
--营业已收租金
(SELECT SUM(nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_item IN (1, 8, 250)) business_received_amount,
--营业未收租金
(SELECT SUM(ccc.due_amount - nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_item IN (1, 8, 250)
) business_unreceived_amount,
--会计已收租金
nvl((SELECT SUM(nvl(gwo.write_off_amount, 0))
FROM gld_write_off gwo
WHERE gwo.reversed_flag = 'N'
AND gwo.contract_id = cc.contract_id
AND gwo.cf_item IN (1, 8, 250)),
0) ac_received_amount,
--会计未收租金
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
) -
nvl((SELECT SUM(nvl(gwo.write_off_amount, 0))
FROM gld_write_off gwo
WHERE gwo.reversed_flag = 'N'
AND gwo.contract_id = cc.contract_id
AND gwo.cf_item IN (1, 8, 250)),
0) ac_unreceived_amount,
--机型
(SELECT ccli.modelcd
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) modelcd,
--机号
(SELECT ccli.machine_number
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) machine_number,
to_char(cc.lease_start_date,'yyyy-mm-dd')lease_start_date,
cc.lease_times,
--租金合计
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
) total_due_amount,
cc.contract_status
(SELECT SUM(ccc.due_amount - nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_item = 9
AND ccc.write_off_flag <> 'FULL'
and ccc.cf_status = 'RELEASE') over_due_amount,
--营业最早逾期的预定支付日
FROM con_contract cc
WHERE
EXISTS (SELECT 1
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
AND TRUNC(ccw.due_date)<=TRUNC(SYSDATE)
AND ccw.due_amount>nvl(ccw.received_amount, 0)
AND ccw.write_off_flag <> 'FULL'
AND ccw.cf_status = 'RELEASE'
AND ccw.cf_direction = 'INFLOW')
AND ('Y' = 'Y' AND EXISTS
(SELECT 1
FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
WHERE a1.trx_category = 'CONTRACT'
AND a1.trx_id = cc.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))))
And ( (decode(${/session/@user_id}, 10600, 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) ) ) t1
(SELECT MIN(ccc.due_date)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
--AND ccc.overdue_status = 'Y'
AND ccc.due_date <= sysdate
AND ccc.cf_item in (1, 8, 9)
AND ccc.write_off_flag <> 'FULL') min_overdue_date,
--营业已收租金
(SELECT SUM(nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_item IN
(1, 8, 250)) business_received_amount,
--营业未收租金
(SELECT SUM(ccc.due_amount - nvl(ccc.received_amount, 0))
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_item IN (1, 8, 250)
) business_unreceived_amount,
--会计已收租金
nvl((SELECT SUM(nvl(gwo.write_off_amount, 0))
FROM gld_write_off gwo
WHERE gwo.reversed_flag = 'N'
AND gwo.contract_id = cc.contract_id
AND gwo.cf_item IN (1, 8, 250)),
0) ac_received_amount,
--会计未收租金
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
) -
nvl((SELECT SUM(nvl(gwo.write_off_amount, 0))
FROM gld_write_off gwo
WHERE gwo.reversed_flag = 'N'
AND gwo.contract_id = cc.contract_id
AND gwo.cf_item IN (1, 8, 250)),
0) ac_unreceived_amount,
--机型
(SELECT ccli.modelcd
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) modelcd,
--机号
(SELECT ccli.machine_number
FROM con_contract_lease_item ccli
WHERE ccli.contract_id = cc.contract_id) machine_number,
to_char(cc.lease_start_date, 'yyyy-mm-dd') lease_start_date,
cc.lease_times,
--租金合计
(SELECT SUM(ccc.due_amount)
FROM con_contract_cashflow ccc
WHERE ccc.contract_id = cc.contract_id
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_item IN (1, 8, 250)
) total_due_amount,
cc.contract_status,
(Select Count(1)
From con_contract_cashflow ccc
Where ccc.contract_id = cc.contract_id
And ccc.cf_item = 1
And ccc.cf_status = 'RELEASE'
And ccc.cf_direction <> 'NONCASH'
And nvl(ccc.overdue_status, 'N') = 'Y'
And ccc.due_amount > nvl(ccc.received_amount, 0)) As business_due_times, -- 营业逾期期数
(Select Max(ccc.overdue_max_days)
From con_contract_cashflow ccc
Where ccc.contract_id = cc.contract_id
And ccc.cf_item = 1
And ccc.cf_status = 'RELEASE'
And ccc.cf_direction <> 'NONCASH'
And nvl(ccc.overdue_status, 'N') = 'Y'
And ccc.due_amount > nvl(ccc.received_amount, 0)) As business_due_days, -- 营业逾期天数
#WHERE_CLAUSE#
(Select Count(1)
From con_contract_cashflow ccc
Where ccc.contract_id = cc.contract_id
And ccc.cf_item = 1
And ccc.cf_status = 'RELEASE'
And ccc.cf_direction <> 'NONCASH'
And nvl(ccc.overdue_status, 'N') = 'Y'
And ccc.due_amount >
nvl((Select Sum(nvl(gwo.write_off_amount, 0))
From gld_write_off gwo
Where gwo.reversed_flag = 'N'
And gwo.contract_id = ccc.contract_id
And gwo.times = ccc.times
And gwo.cf_item = ccc.cf_item),
0)) As account_due_times, -- 会计逾期期数
(Select floor(Sysdate - Min(ccc.due_date))
From con_contract_cashflow ccc
Where ccc.contract_id = cc.contract_id
--modify by shen 不统计留购价
And ccc.cf_item In (1)
And ccc.cf_status = 'RELEASE'
And trunc(ccc.due_date) <= trunc(Sysdate)
And ccc.due_amount >
nvl((Select Sum(nvl(gwo.write_off_amount, 0))
From gld_write_off gwo
Where gwo.reversed_flag = 'N'
And gwo.contract_id = ccc.contract_id
And gwo.times = ccc.times
And gwo.cf_item = ccc.cf_item),
0)) As account_due_days -- 会计逾期天数
FROM con_contract cc
WHERE
EXISTS(SELECT 1
FROM con_contract_cashflow ccw
WHERE ccw.contract_id = cc.contract_id
AND TRUNC(ccw.due_date) <= TRUNC(SYSDATE)
AND ccw.due_amount > nvl(ccw.received_amount, 0)
AND ccw.write_off_flag <> 'FULL'
And ccw.overdue_status = 'Y'
AND ccw.cf_status = 'RELEASE'
AND ccw.cf_direction = 'INFLOW')
AND ('Y' = 'Y' AND EXISTS
(SELECT 1
FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
WHERE a1.trx_category = 'CONTRACT'
AND a1.trx_id = cc.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))))
And ((decode(${/session/@user_id}, 10600, 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))) t1
#WHERE_CLAUSE#
]]>
</bm:query-sql>
</bm:operation>
......@@ -205,7 +271,7 @@
<bm:query-field name="contract_number"
queryExpression="contract_number like ${@contract_number}"/>
<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>
<!-- <bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>-->
<!-- <bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>-->
<bm:query-field name="project_number" queryExpression="t1.project_number like ${@project_number}"/>
<!--<bm:query-field name="bp_id_tenant_desc" queryExpression="t1.bp_id_tenant_desc like ${@bp_id_tenant_desc}"/>-->
<bm:query-field name="bp_id_agent_desc" queryExpression="t1.bp_id_agent_desc like ${@bp_id_agent_desc}"/>
......@@ -226,18 +292,29 @@
queryExpression="t1.promised_return_date &gt;= to_date(${@promised_return_date_from},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="promised_return_date_to"
queryExpression="t1.promised_return_date &lt;= to_date(${@promised_return_date_to},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="account_due_times_from" queryExpression="t1.account_due_times &gt;= ${@account_due_times_from}"/>
<bm:query-field name="account_due_times_to" queryExpression="t1.account_due_times &lt;= ${@account_due_times_to}"/>
<bm:query-field name="account_due_days_from" queryExpression="t1.account_due_days &gt;= ${@account_due_days_from}"/>
<bm:query-field name="account_due_times_from"
queryExpression="t1.account_due_times &gt;= ${@account_due_times_from}"/>
<bm:query-field name="account_due_times_to"
queryExpression="t1.account_due_times &lt;= ${@account_due_times_to}"/>
<bm:query-field name="account_due_days_from"
queryExpression="t1.account_due_days &gt;= ${@account_due_days_from}"/>
<bm:query-field name="account_due_days_to" queryExpression="t1.account_due_days &lt;= ${@account_due_days_to}"/>
<bm:query-field name="account_due_amount_from" queryExpression="t1.account_due_amount &gt;= ${@account_due_amount_from}"/>
<bm:query-field name="account_due_amount_to" queryExpression="t1.account_due_amount &lt;= ${@account_due_amount_to}"/>
<bm:query-field name="business_due_times_from" queryExpression="t1.business_due_times &gt;= ${@business_due_times_from}"/>
<bm:query-field name="business_due_times_to" queryExpression="t1.business_due_times &lt;= ${@business_due_times_to}"/>
<bm:query-field name="business_due_days_from" queryExpression="t1.business_due_days &gt;= ${@business_due_days_from}"/>
<bm:query-field name="business_due_days_to" queryExpression="t1.business_due_days &lt;= ${@business_due_days_to}"/>
<bm:query-field name="business_due_amount_from" queryExpression="t1.business_due_amount &gt;= ${@business_due_amount_from}"/>
<bm:query-field name="business_due_amount_to" queryExpression="t1.business_due_amount &lt;= ${@business_due_amount_to}"/>
<bm:query-field name="account_due_amount_from"
queryExpression="t1.account_due_amount &gt;= ${@account_due_amount_from}"/>
<bm:query-field name="account_due_amount_to"
queryExpression="t1.account_due_amount &lt;= ${@account_due_amount_to}"/>
<bm:query-field name="business_due_times_from"
queryExpression="t1.business_due_times &gt;= ${@business_due_times_from}"/>
<bm:query-field name="business_due_times_to"
queryExpression="t1.business_due_times &lt;= ${@business_due_times_to}"/>
<bm:query-field name="business_due_days_from"
queryExpression="t1.business_due_days &gt;= ${@business_due_days_from}"/>
<bm:query-field name="business_due_days_to"
queryExpression="t1.business_due_days &lt;= ${@business_due_days_to}"/>
<bm:query-field name="business_due_amount_from"
queryExpression="t1.business_due_amount &gt;= ${@business_due_amount_from}"/>
<bm:query-field name="business_due_amount_to"
queryExpression="t1.business_due_amount &lt;= ${@business_due_amount_to}"/>
<bm:query-field name="owner_user_id" queryExpression="t1.owner_user_id = ${@owner_user_id}"/>
<bm:query-field name="lease_organization" queryExpression="t1.lease_organization = ${@lease_organization}"/>
</bm:query-fields>
......
src/main/webapp/WEB-INF/classes/hls/HLS801/con_unearned_finance_income.lwm
View file @ 8a35362a
......@@ -59,7 +59,7 @@
<bm:query-field field="finance_income_recognized" queryExpression="t1.finance_income_recognized=${@finance_income_recognized}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.internal_period_num = ${@internal_period_num} and exists (Select 1 From con_contract c Where t1.contract_id = c.contract_id And c.data_class = &apos;NORMAL&apos; And (c.contract_status = &apos;INCEPT&apos; Or c.contract_status = &apos;TERMINATE&apos; Or (c.contract_status = &apos;PENDING&apos; And Exists (Select 1 From con_contract_et_hd e Where e.contract_id = c.contract_id And e.document_type = &apos;ET&apos; And e.available_flag = &apos;Y&apos; And e.status = &apos;NEW&apos;)) Or c.contract_status = &apos;ETING&apos; Or (c.contract_status = &apos;PENDING&apos; And Exists (Select 1 From con_contract_change_req cc Where cc.contract_id = c.contract_id And cc.document_type = &apos;PAYCARD&apos; And cc.req_status In (&apos;NEW&apos;))))) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
<bm:data-filter enforceOperations="query" expression="t1.internal_period_num = ${@internal_period_num} and exists (Select 1 From con_contract cc Where t1.contract_id = cc.contract_id And cc.data_class = &apos;NORMAL&apos; And t1.cf_item In (1, 8) And ((t1.cf_item = 1 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;, &apos;ETING&apos;, &apos;REPURING&apos;)) Or (t1.cf_item = 8 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;))) ) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
<bm:data-filter enforceOperations="query" expression="to_char(t1.calc_end_date,&apos;yyyy-mm-dd&apos;) = ${@calc_end_date} "/>
<bm:data-filter enforceOperations="query" expression="t1.cashflow_id in (select cw.cashflow_id from con_contract_cashflow cw where cw.cf_direction not in ('NONCASH'))"/>
<!-- <bm:data-filter enforceOperations="query" expression="t1.contract_id in (select contract_id from con_contract t where nvl(t.fraud_flag,'N') !='Y')"/>-->
......
src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_ac_doc_info_2_queryfields.js 0 → 100644
View file @ 8a35362a
var add_datafilters = [ {
name : 'attach_type',
expression : "(t1.attach_type = 'ACCOUNT')"
} ];
add_datafilter();
src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_ac_g_cashflow_queryfields.js 0 → 100644
View file @ 8a35362a
var add_datafilters = [ {
name : 'bp_category',
expression : "(trunc(t1.due_date) <= trunc(Sysdate) and (t1.account_unreceived_9 > 0 or t1.account_unreceived_amount > 0))"
} ];
add_datafilter();
src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_ac_g_phone_collection_queryfields.js 0 → 100644
View file @ 8a35362a
var add_datafilters = [ {
name : 'user_col_v01',
expression : "(t1.user_col_v01 = 'ACCOUNT')"
} ];
add_datafilter();
src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_doc_info_2_queryfields.js 0 → 100644
View file @ 8a35362a
var add_datafilters = [ {
name : 'attach_type',
expression : "(t1.attach_type = 'BUSINESS')"
} ];
add_datafilter();
src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_g_cashflow_queryfields.js 0 → 100644
View file @ 8a35362a
var add_datafilters = [ {
name : 'cashflow',
expression : "(Exists (Select 1 From con_contract_cashflow c1 Where c1.contract_id = t1.contract_id And c1.times = t1.times And ((nvl(t1.overdue_status, 'N') = 'Y' And t1.cf_item <> 9) Or (t1.cf_item = 9)) And nvl(c1.write_off_flag, 'NOT') <> 'FULL'))"
} ];
add_datafilter();
src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_g_phone_collection_queryfields.js 0 → 100644
View file @ 8a35362a
var add_datafilters = [ {
name : 'user_col_v01',
expression : "(t1.user_col_v01 = 'BUSINESS')"
} ];
add_datafilter();
src/main/webapp/WEB-INF/server-script/layoutconfig/je_detail_query_g_result_queryfields.js
View file @ 8a35362a
......@@ -14,6 +14,10 @@ var override_queryfields = [
{
name : 'journal_date_to',
queryexpression : "t1.journal_date <= to_date(${@journal_date_to},'YYYY-MM-DD')"
},
{
name : 'contract_number',
queryexpression : "t1.reference3 = ${@contract_number}"
}
];
......
src/main/webapp/WEB-INF/uncertain.local.xml 0 → 100644
View file @ 8a35362a
<?xml version="1.0" encoding="UTF-8"?>
<uncertain-engine defaultLogLevel="INFO">
<path-config logPath="D:\install_soft\jenkins_logs" uiPackageBasePath="D:\install_soft\apache-tomcat-jenkins\webapps\hlcm\lib\LeafUI\src"/>
</uncertain-engine>
\ No newline at end of file
src/main/webapp/modules/cont/CON500/con_contract_get_layout_code.lview
View file @ 8a35362a
......@@ -123,6 +123,62 @@
}
return '';
}
// 获取组件ID 参数prompt若传入则传'prompt'
function get_id_by_basetable(layoutDataSetList, base_table, name, prompt) {
var base_table_temp = '_' + base_table.toLowerCase() + '_ds';
for (var i = 0; i < layoutDataSetList.length; i++) {
var dsId = layoutDataSetList[i];
if (dsId.substring(dsId.length - base_table_temp.length, dsId.length).toLowerCase() == base_table_temp) {
if(name){
if(name.toUpperCase() != 'F' && name.toUpperCase() != 'G'){
// 针对form下字段
if(prompt){
return dsId.substring(0, dsId.length - base_table_temp.length) + '_' + (base_table||'NULL').toUpperCase() + '_' + name.toUpperCase() + '_' + prompt;
}else{
return dsId.substring(0, dsId.length - base_table_temp.length) + '_' + (base_table||'NULL').toUpperCase() + '_' + name.toUpperCase();
}
}else if(name.toUpperCase() == 'F'){
// 针对form
return dsId.substring(0, dsId.length - base_table_temp.length) + '_component_id';
}else if(name.toUpperCase() == 'G'){
// 针对grid
// return dsId.substring(0, dsId.length - base_table_temp.length) + '_' + (base_table||'').toLowerCase() + '_layout_grid_id';
return dsId.replace('ds', 'layout_grid_id');
}
}
}
}
return '';
}
// 获取组件ID 参数prompt若传入则传'prompt'
function get_id_by_tabcode_basetable(layoutDataSetList, tab_code, base_table, name, prompt) {
if (tab_code) {
var base_table_temp = tab_code + '_' + base_table.toLowerCase() + '_ds';
for (var i = 0; i < layoutDataSetList.length; i++) {
var dsId = layoutDataSetList[i];
if (dsId.substring(dsId.length - base_table_temp.length, dsId.length).toLowerCase() == base_table_temp.toLowerCase()) {
if(name){
if(name.toUpperCase() != 'F' && name.toUpperCase() != 'G'){
// 针对form下字段
if(prompt){
return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase() + '_' + (base_table||'NULL').toUpperCase() + '_' + name.toUpperCase() + '_' + prompt;
}else{
return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase() + '_' + (base_table||'NULL').toUpperCase() + '_' + name.toUpperCase(); }
}else if(name.toUpperCase() == 'F'){
// 针对form
return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase() + '_component_id';
}else if(name.toUpperCase() == 'G'){
// 针对grid
// return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase() + '_' + (base_table||'').toLowerCase() + '_layout_grid_id';
return dsId.replace('ds', 'layout_grid_id');
}
}
}
}
}
return '';
}
]]></script>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
View file @ 8a35362a
......@@ -113,7 +113,7 @@
} catch (e) {
raise_app_error(e);
}
if (record_data.templet_code == 'FINANCE_LEASE_CONTRACT'||record_data.templet_code == 'FINANCE_LEASE_CONTRACT_A4'||record_data.templet_code == 'BUSINESS_CONTRACT'||record_data.templet_code == 'BUSINESS_CONTRACT_XJ'||record_data.templet_code=='LEASE_EXCHANGE'||record_data.templet_code=='LEASE_EXCHANGE_GN'||record_data.templet_code=='FINANCE_LEASE_CONTRACT_EX'||record_data.templet_code=='BUSINESS_CONTRACT_GK') {
if (record_data.templet_code == 'FINANCE_LEASE_CONTRACT'||record_data.templet_code == 'FINANCE_LEASE_CONTRACT_A4'||record_data.templet_code == 'BUSINESS_CONTRACT'||record_data.templet_code == 'BUSINESS_CONTRACT_XJ'||record_data.templet_code=='LEASE_EXCHANGE'||record_data.templet_code=='LEASE_EXCHANGE_GN'||record_data.templet_code=='FINANCE_LEASE_CONTRACT_EX'||record_data.templet_code=='BUSINESS_CONTRACT_GK'||record_data.templet_code == 'REPURCHASE_DEBT_OFFSET') {
// word转pdf
var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;
......
src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview
View file @ 8a35362a
......@@ -72,10 +72,15 @@
function con560_con_contract_detail() {
var records = $('con560_contract_result_ds').getSelected();
var seal_record = $('seal_info_ds').getCurrentRecord();
if (!records.length) {
Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录');
return;
}
if(!records[0].get('et_date')){
$L.showInfoMessage("提示",'请输入合同结束日！');
return;
}
//判断数据有没有修改
var arrys=$('con560_contract_result_ds').data;
for(var i=0;i<arrys.length;i++){
......@@ -251,7 +256,7 @@
queryUrl="${/request/@context_path}/autocrud/cont.CON560.con_contract_finish_for_query/query"
selectable="true" selectionModel="single">
<!--<a:fields>
<a:field name="contract_status_n" displayField="code_value_name" options="con560_contract_status_grid_ds" returnField="contract_status" valueField="code_value"/>
<a:field name="et_date" required="true" readOnly="false"/>
</a:fields>-->
<a:events>
<a:event name="indexChange" handler="onIndexChange"/>
......@@ -328,7 +333,7 @@
<a:grid bindTarget="unreceivedAmountDs" height="250" marginWidth="55" navBar="true">
<a:columns>
<a:column name="times" prompt="期数"/>
<a:column name="cf_type_dis" prompt="类型"/>
<a:column name="cf_item_dis" prompt="类型"/>
<a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
<a:column name="received_amount" align="right" prompt="已收金额"
renderer="Leaf.formatMoney"/>
......@@ -345,7 +350,7 @@
<a:grid bindTarget="receivedAmountDs" height="250" marginWidth="55" navBar="true">
<a:columns>
<a:column name="times" prompt="期数"/>
<a:column name="cf_type_dis" prompt="类型"/>
<a:column name="cf_item_dis" prompt="类型"/>
<a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
<a:column name="received_amount" align="right" prompt="已收金额"
renderer="Leaf.formatMoney"/>
......
src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview
View file @ 8a35362a
......@@ -249,7 +249,7 @@
<a:grid bindTarget="unreceivedAmountDs" marginHeight="325" marginWidth="55" navBar="true">
<a:columns>
<a:column name="times" prompt="期数"/>
<a:column name="cf_type_dis" prompt="类型"/>
<a:column name="cf_item_dis" prompt="类型"/>
<a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
<a:column name="received_amount" align="right" prompt="已收金额"
renderer="Leaf.formatMoney"/>
......@@ -266,7 +266,7 @@
<a:grid bindTarget="receivedAmountDs" marginHeight="325" marginWidth="55" navBar="true">
<a:columns>
<a:column name="times" prompt="期数"/>
<a:column name="cf_type_dis" prompt="类型"/>
<a:column name="cf_item_dis" prompt="类型"/>
<a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
<a:column name="received_amount" align="right" prompt="已收金额"
renderer="Leaf.formatMoney"/>
......
src/main/webapp/modules/cont/CON620/con_contract_account_detail.lview 0 → 100644
View file @ 8a35362a
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: lpc 9874
$Date:
$Revision: 1.0
$Purpose: 租赁物查看
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true"
dynamiccreateenabled="true" trace="true">
<a:view>
<script type="text/javascript"><![CDATA[
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON620/con_contract_rent_detail.lview
View file @ 8a35362a
......@@ -36,16 +36,19 @@
url="${/request/@context_path}/modules/cont/CON620/create_content_con_lease.lsc"/>
<a:link id="lease_return_print_link"
url="${/request/@context_path}/modules/cont/CON620/create_content_lease_return.lsc"/>
<a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
Ext.ux.Lightbox.register('a[ref=img]', true);
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
var con_accounting_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_accounting_manage');
/*var con_accounting_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_accounting_manage');
var accounting_record = $(con_accounting_ds_id).getCurrentRecord();
$('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').setQueryParameter('con_accounting_id', accounting_record.get('con_accounting_id'));
$('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').query();
$('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').query();*/
$(ds.id).query();
};
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
......@@ -97,6 +100,7 @@
function upload_file(id, name, query_only) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_accounting_manage_attch');
if (record.get('con_accounting_attch_id')) {
var url;
if (query_only == 'Y') {
......@@ -113,9 +117,10 @@
});
win.on('close', function () {
$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_id', record.get('con_accounting_id'));
// $('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_attch_id', record.get('con_accounting_attch_id'));
$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').query();
/*$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_id', record.get('con_accounting_id'));
$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_attch_id', record.get('con_accounting_attch_id'));
$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').query();*/
$(ds).query();;
});
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
......@@ -158,15 +163,18 @@
}
};
Leaf.onReady(function() {
if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "";
document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "";
} else {
document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "none";
document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "none";
if('${/parameter/@function_code}' == 'CON620D'){
if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "";
document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "";
} else {
document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "none";
document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "none";
}
}
});
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON620/con_contract_rent_dun_query.lview
View file @ 8a35362a
......@@ -17,6 +17,10 @@
url="${/request/@context_path}/modules/cont/CON747/con_contract_penatly_change_req_detail.lview"/>
<a:link id="con_contract_dun_detail_link_id"
url="${/request/@context_path}/modules/cont/CON620/con_contract_rent_detail.lview"/>
<a:link id="con_contract_account_detail_link_id"
url="${/request/@context_path}/modules/cont/CON620/con_contract_account_detail.lview"/>
<a:link id="con_contract_query_link_id"
url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
<script type="text/javascript"><![CDATA[
function CON601_con_contract_query() {
$('CON620_contract_result_ds').query();
......@@ -29,9 +33,9 @@
function CON620_render_contract_dun_grid(value, record, name) {
if (name == 'contract_number') {
if (record.get('overdue_times') > 1) {
return '<u><a style="color:red" href="javascript:contract_link(' + record.id + ');">' + value + '</a></u>';
return '<u><a style="color:red" href="javascript:contract_detail_link(' + record.id + ');">' + value + '</a></u>';
} else {
return '<a href="javascript:contract_link(' + record.id + ');">' + value + '</a>';
return '<a href="javascript:contract_detail_link(' + record.id + ');">' + value + '</a>';
}
} else if (name == 'bp_id_tenant_desc') {
//商业伙伴查询页面要做好，然后在此处关联。
......@@ -50,6 +54,30 @@
return '<a href="javascript:bp_id_agent_desc_link(' + record.get('bp_id_agent_level1') + ',\'' + record.get('bp_id_agent_class') + '\')">' + value + '</a>';
}
}
}else if (name == 'business_due_amount') {
if (record.get('overdue_times') > 1) {
return '<u><a style="color:red" href="javascript:contract_business_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a></u>';
} else {
return '<a href="javascript:contract_business_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a>';
}
}else if (name == 'account_due_amount') {
if (record.get('overdue_times') > 1) {
return '<u><a style="color:red" href="javascript:contract_account_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a></u>';
} else {
return '<a href="javascript:contract_account_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a>';
}
}else if (name == 'business_received_amount') {
if (record.get('overdue_times') > 1) {
return '<u><a style="color:red" href="javascript:business_received_amount_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a></u>';
} else {
return '<a href="javascript:business_received_amount_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a>';
}
}else if (name == 'ac_received_amount') {
if (record.get('overdue_times') > 1) {
return '<u><a style="color:red" href="javascript:ac_received_amount_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a></u>';
} else {
return '<a href="javascript:ac_received_amount_link(' + record.id + ');">' + Leaf.formatMoney(value) + '</a>';
}
}
}
......@@ -83,7 +111,89 @@
}
function con601_param_set_value(param) {
function ac_received_amount_link(id) {
var current_record = $('CON620_contract_result_ds').findById(id);
var record = current_record;
var saveData = [];
for (var k in record.data) {
var item = record.data[k];
if (item && item.xtype == 'dataset') {
delete record.data[k];
}
}
var param = record.data;
param['document_id'] = current_record.get('contract_id');
param['document_category'] = 'CONTRACT';
param['function_code'] = 'CON620R';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'READONLY';
param['url_title'] = '业务冲销详情';
param['company_id'] = '${/session/@company_id}';
//
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_account_detail_link_id', 'CON620_contract_result_ds');
}
function business_received_amount_link(id) {
//
var current_record = $('CON620_contract_result_ds').findById(id);
var record = current_record;
var saveData = [];
for (var k in record.data) {
var item = record.data[k];
if (item && item.xtype == 'dataset') {
delete record.data[k];
}
}
var param = record.data;
param['document_id'] = current_record.get('contract_id');
// con601_param_set_value(param);
param['document_category'] = 'CONTRACT';
param['function_code'] = 'CON620Q';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'READONLY';
param['url_title'] = '业务冲销详情';
param['company_id'] = '${/session/@company_id}';
//
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_account_detail_link_id', 'CON620_contract_result_ds');
}
function contract_account_link(id) {
var current_record = $('CON620_contract_result_ds').findById(id);
var record = current_record;
var saveData = [];
for (var k in record.data) {
var item = record.data[k];
if (item && item.xtype == 'dataset') {
delete record.data[k];
}
}
var param = record.data;
param['document_id'] = current_record.get('contract_id');
param['document_category'] = 'CONTRACT';
param['function_code'] = 'CON620F';
param['function_usage'] = 'UPDATE';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '催收详情';
param['company_id'] = '${/session/@company_id}';
//
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_dun_detail_link_id', 'CON620_contract_result_ds');
}
function contract_business_link(id) {
//
var current_record = $('CON620_contract_result_ds').findById(id);
var record = current_record;
var saveData = [];
for (var k in record.data) {
var item = record.data[k];
if (item && item.xtype == 'dataset') {
delete record.data[k];
}
}
var param = record.data;
param['document_id'] = current_record.get('contract_id');
// con601_param_set_value(param);
param['document_category'] = 'CONTRACT';
param['function_code'] = 'CON620D';
param['function_usage'] = 'UPDATE';
......@@ -94,7 +204,7 @@
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_dun_detail_link_id', 'CON620_contract_result_ds');
}
function contract_link(id) {
function contract_detail_link(id) {
//
var current_record = $('CON620_contract_result_ds').findById(id);
var record = current_record;
......@@ -107,7 +217,14 @@
}
var param = record.data;
param['document_id'] = current_record.get('contract_id');
con601_param_set_value(param);
param['document_category'] = 'CONTRACT';
param['function_code'] = 'CON3200Q';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'QUERY';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
param['company_id'] = '${/session/@company_id}';
//
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_query_link_id');
}
function summaryRenderer(datas, name) {
......@@ -201,7 +318,13 @@
$('CON601_con_contract_grid_ds').hideColumn('ac_unreceived_amount');
}
});
function render_formatDate(value, record, name) {
if (!Ext.isEmpty(value)) {
return value.parseDate('yyyy-mm-dd').format('yyyy-mm-dd');
}
return '';
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets>
......@@ -259,11 +382,40 @@
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton click="CON601_con_contract_query" text="HLS.QUERY"/>
<a:gridButton click="CON601_con_contract_reset" text="HLS.RESET"/>
<a:gridButton click="CON601_con_contract_query" text="HLS.QUERY"/>
<!--<a:gridButton id="CON601_con_contract_print_btn" click="CON601_con_contract_print" text="打印催收函"/>-->
</a:screenTopToolbar>
<a:form column="4" labelWidth="120" marginWidth="30" title="CON301.CONTRACT_QUERY">
<a:queryForm title="CON301.CONTRACT_QUERY" style="background-color: white;" id="condition_queryForm" bindTarget="CON620_contract_query_ds" createSearchButton="false" resultTarget="CON620_contract_result_ds" labelWidth="120" marginWidth="30">
<a:formToolBar style="background-color: white;">
<a:box labelWidth="140" column="4" style="width:100%">
<a:textField name="contract_number" bindTarget="CON620_contract_query_ds" prompt="HLS.CONTRACT_NUMBER"/>
<!--<a:textField name="contract_name" bindTarget="CON620_contract_query_ds" prompt="合同名称"/>-->
<a:lov name="bp_id_tenant_n" 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="business_type_n" bindTarget="CON620_contract_query_ds" prompt="业务类型"/>
<a:comboBox name="division_n" bindTarget="CON620_contract_query_ds" prompt="租赁物"/>
</a:box>
</a:formToolBar>
<a:formBody style="background-color: white;">
<a:box labelWidth="120" column="4">
<a:numberField name="business_due_times_from" bindTarget="CON620_contract_query_ds" prompt="逾期期数(营业)从" allowDecimals="false"/>
<a:numberField name="business_due_times_to" bindTarget="CON620_contract_query_ds" prompt="逾期期数(营业)到" allowDecimals="false"/>
<a:numberField name="business_due_days_from" bindTarget="CON620_contract_query_ds" prompt="逾期天数(营业)从" allowDecimals="false"/>
<a:numberField name="business_due_days_to" bindTarget="CON620_contract_query_ds" prompt="逾期天数(营业)到" allowDecimals="false"/>
<a:numberField name="business_due_amount_from" bindTarget="CON620_contract_query_ds" prompt="逾期金额(营业)从"/>
<a:numberField name="business_due_amount_to" bindTarget="CON620_contract_query_ds" prompt="逾期金额(营业)到"/>
<a:numberField id="account_due_times_from_id" name="account_due_times_from" bindTarget="CON620_contract_query_ds" prompt="逾期期数(会计)从" allowDecimals="false"/>
<a:numberField id="account_due_times_to_id" name="account_due_times_to" bindTarget="CON620_contract_query_ds" prompt="逾期期数(会计)到" allowDecimals="false"/>
<a:numberField id="account_due_days_from_id" name="account_due_days_from" bindTarget="CON620_contract_query_ds" prompt="逾期天数(会计)从" allowDecimals="false"/>
<a:numberField id="account_due_days_to_id" name="account_due_days_to" bindTarget="CON620_contract_query_ds" prompt="逾期天数(会计)到" allowDecimals="false"/>
<a:numberField id="account_due_amount_from_id" name="account_due_amount_from" bindTarget="CON620_contract_query_ds" prompt="逾期金额(会计)从"/>
<a:numberField id="account_due_amount_to_id" name="account_due_amount_to" bindTarget="CON620_contract_query_ds" prompt="逾期金额(会计)到"/>
</a:box>
</a:formBody>
</a:queryForm>
<!--<a:form column="4" labelWidth="120" marginWidth="30" title="CON301.CONTRACT_QUERY">
<a:textField name="contract_number" bindTarget="CON620_contract_query_ds" prompt="HLS.CONTRACT_NUMBER"/>
<a:textField name="contract_name" bindTarget="CON620_contract_query_ds" prompt="合同名称"/>
<a:lov name="bp_id_tenant_n" bindTarget="CON620_contract_query_ds" prompt="HLS.TENANT_CODE"/>
......@@ -283,7 +435,7 @@
<a:numberField id="account_due_amount_from_id" name="account_due_amount_from" bindTarget="CON620_contract_query_ds" prompt="逾期金额(会计)从"/>
<a:numberField id="account_due_amount_to_id" name="account_due_amount_to" bindTarget="CON620_contract_query_ds" prompt="逾期金额(会计)到"/>
</a:form>
</a:form>-->
<a:grid id="CON601_con_contract_grid_ds" bindTarget="CON620_contract_result_ds" marginHeight="100"
marginWidth="30" navBar="true" height="1000">
<a:columns>
......@@ -295,19 +447,20 @@
<!-- prompt="合同名称" width="120"/>-->
<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="Leaf.formatDate"/>
<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="Leaf.formatMoney" footerRenderer="summaryRenderer"
<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="Leaf.formatMoney" footerRenderer="summaryRenderer"
<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"/>
......@@ -317,9 +470,9 @@
width="100"/>
<a:column name="account_due_days" align="center" prompt="逾期天数"
width="100"/>
<a:column name="account_due_amount" align="right" prompt="逾期金额" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
<a:column name="account_due_amount" align="right" prompt="逾期金额" renderer="CON620_render_contract_dun_grid" footerRenderer="summaryRenderer"
width="100"/>
<a:column name="ac_received_amount" align="right" prompt="已收租金" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
<a:column name="ac_received_amount" align="right" prompt="已收租金" renderer="CON620_render_contract_dun_grid" footerRenderer="summaryRenderer"
width="100"/>
<a:column name="ac_unreceived_amount" align="right" prompt="未收租金" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
......
src/main/webapp/modules/hls/hls_comment_report.lview
View file @ 8a35362a
......@@ -8,13 +8,24 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<a:init-procedure/>
<a:view>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<script type="text/javascript">
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
if (ds == $(ds_id)) {
aut_authority_list_validate_query(ds, qpara);
}
//异步打印
ds.setQueryParameter('__async__', 'Y');
//ds.setQueryParameter('__async__', 'Y');
};
<![CDATA[
]]></script>
<a:screen-include
screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=GENERAL&amp;function_code=HLS302"/>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
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