From 9a4c4ba1187b73986aee5c4183b886542aae12e1 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Tue, 20 Oct 2020 15:34:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E9=93=B6=E6=94=B6=E6=AC=BE=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8F=8A=E9=80=9A=E8=81=94=E8=A1=A5=E5=85=85sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_jbo/jbo/loan/VI_RENT_COLLECT_4_EBANK.java | 104 ++++++++++++++++++ src_sql/view/vi_lc_audit_rent_plan.sql | 21 ++-- src_sql/view/vi_rent_collect.sql | 57 ++++++++++ src_sql/view/vi_rent_collect_4_ebank.sql | 55 +++++++++ src_sql/鎶曚骇SQL/v20201022/zhangbb20201022.sql | 53 +++++++++ .../cache/CollectAuditInfoCacheTj.java | 20 +++- .../rentincome/VILCRentPlanListHandler.java | 76 +++++++------ .../rentreback/VILCSplitCHargeHandler.java | 65 ----------- 8 files changed, 333 insertions(+), 118 deletions(-) create mode 100644 src_jbo/jbo/loan/VI_RENT_COLLECT_4_EBANK.java create mode 100644 src_sql/view/vi_rent_collect.sql create mode 100644 src_sql/view/vi_rent_collect_4_ebank.sql create mode 100644 src_sql/鎶曚骇SQL/v20201022/zhangbb20201022.sql delete mode 100644 src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCSplitCHargeHandler.java diff --git a/src_jbo/jbo/loan/VI_RENT_COLLECT_4_EBANK.java b/src_jbo/jbo/loan/VI_RENT_COLLECT_4_EBANK.java new file mode 100644 index 000000000..7f1c32e2e --- /dev/null +++ b/src_jbo/jbo/loan/VI_RENT_COLLECT_4_EBANK.java @@ -0,0 +1,104 @@ +package jbo.loan; + +import java.lang.String; + +/** +* 扣款信息(网银收款专用) - JBO命名常量类

+* Note: This file is generated by ADE tools, dont modify it.
+ +*/ +public interface VI_RENT_COLLECT_4_EBANK{ + /** + * 扣款信息(网银收款专用)

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.loan.VI_RENT_COLLECT_4_EBANK"; + /** + * 标识 STRING(32)
+ */ + public static final String ID = "ID"; + /** + * 合同id STRING(32)
+ */ + public static final String contract_id = "contract_id"; + /** + * 业务类型 STRING(32)
+ */ + public static final String businesstype = "businesstype"; + /** + * 主体id STRING(32)
+ */ + public static final String subjectid = "subjectid"; + /** + * 主体名称 STRING(32)
+ */ + public static final String subjectname = "subjectname"; + /** + * 经销商id STRING(32)
+ */ + public static final String distributor_id = "distributor_id"; + /** + * 合同编号 STRING(32)
+ */ + public static final String contract_number = "contract_number"; + /** + * payment_number STRING(32)
+ */ + public static final String payment_number = "payment_number"; + /** + * 客户名称 STRING(32)
+ */ + public static final String customername = "customername"; + /** + * 客户账号 STRING(32)
+ */ + public static final String acc_number = "acc_number"; + /** + * 期次 STRING(32)
+ */ + public static final String plan_list = "plan_list"; + /** + * 计划日期 STRING(32)
+ */ + public static final String plan_date = "plan_date"; + /** + * 扣款状态 STRING(32)
+ */ + public static final String collect_status = "collect_status"; + /** + * 扣款状态信息 STRING(32)
+ */ + public static final String collect_msg = "collect_msg"; + /** + * 处理状态信息 STRING(32)
+ */ + public static final String batch_status = "batch_status"; + /** + * 租金 DOUBLE(32)
+ */ + public static final String rent = "rent"; + /** + * 本金 DOUBLE(32)
+ */ + public static final String corpus = "corpus"; + /** + * 利息 DOUBLE(32)
+ */ + public static final String interest = "interest"; + /** + * 租金余额 DOUBLE(32)
+ */ + public static final String rent_over = "rent_over"; + /** + * 本金余额 DOUBLE(32)
+ */ + public static final String corpus_over = "corpus_over"; + /** + * 利息余额 DOUBLE(32)
+ */ + public static final String interest_over = "interest_over"; + /** + * 已收总罚息 DOUBLE(32)
+ */ + public static final String penalty_sum = "penalty_sum"; +} \ No newline at end of file diff --git a/src_sql/view/vi_lc_audit_rent_plan.sql b/src_sql/view/vi_lc_audit_rent_plan.sql index 9048256bf..2e4a42032 100644 --- a/src_sql/view/vi_lc_audit_rent_plan.sql +++ b/src_sql/view/vi_lc_audit_rent_plan.sql @@ -1,8 +1,9 @@ DELIMITER $$ -ALTER ALGORITHM=UNDEFINED DEFINER=`apzl`@`%` SQL SECURITY DEFINER VIEW `vi_lc_audit_rent_plan` AS +ALTER ALGORITHM=UNDEFINED DEFINER=`apzl`@`%` SQL SECURITY DEFINER VIEW `apzl`.`vi_lc_audit_rent_plan` AS SELECT `lcrp`.`ID` AS `ID`, + `lcrp`.`PROJECT_ID` AS `project_id`, `lci`.`distributor_id` AS `DISTRIBUTOR_ID`, `lcrp`.`CONTRACT_ID` AS `CONTRACT_ID`, `lci`.`CONTRACT_NUMBER` AS `CONTRACT_NUMBER`, @@ -23,6 +24,7 @@ SELECT `cat`.`ACCOUNT` AS `ACCOUNT`, `cat`.`ACC_NUMBER` AS `ACC_NUMBER`, `cat`.`MOBILE` AS `MOBILE`, + `cat`.`collect_type` AS `collect_type`, IFNULL(`cat`.`SIGN_STATUS`,'N') AS `SIGN_STATUS`, IFNULL(`lcrp`.`AUDIT_STATE`,'N') AS `AUDIT_STATE`, IFNULL(`lcrp`.`COLLECT_STATUS`,'未收款') AS `COLLECT_STATUS`, @@ -60,14 +62,15 @@ FROM (((((`apzl`.`lc_rent_plan` `lcrp` LEFT JOIN `apzl`.`lb_union_lessee` `lul` ON ((`lul`.`CONTRACT_ID` = `lci`.`ID`))) LEFT JOIN (SELECT DISTINCT - `apzl`.`customer_account`.`bank_name` AS `BANK_NAME`, - `apzl`.`customer_account`.`account` AS `ACCOUNT`, - `apzl`.`customer_account`.`acc_number` AS `ACC_NUMBER`, - `apzl`.`customer_account`.`customerid` AS `CUSTOMERID`, - `apzl`.`customer_account`.`acc_type` AS `ACC_TYPE`, - `apzl`.`customer_account`.`MOBILE` AS `MOBILE`, - `apzl`.`customer_account`.`sign_status` AS `SIGN_STATUS`, - `apzl`.`customer_account`.`CONTRACT_ID` AS `CONTRACT_ID` + `apzl`.`customer_account`.`bank_name` AS `BANK_NAME`, + `apzl`.`customer_account`.`account` AS `ACCOUNT`, + `apzl`.`customer_account`.`acc_number` AS `ACC_NUMBER`, + `apzl`.`customer_account`.`customerid` AS `CUSTOMERID`, + `apzl`.`customer_account`.`acc_type` AS `ACC_TYPE`, + `apzl`.`customer_account`.`MOBILE` AS `MOBILE`, + `apzl`.`customer_account`.`sign_status` AS `SIGN_STATUS`, + `apzl`.`customer_account`.`CONTRACT_ID` AS `CONTRACT_ID`, + `apzl`.`customer_account`.`collect_type` AS `collect_type` FROM `apzl`.`customer_account`) `cat` ON (((`cat`.`ACC_TYPE` = 'Debit') AND (`cat`.`CONTRACT_ID` = `lcrp`.`CONTRACT_ID`)))) diff --git a/src_sql/view/vi_rent_collect.sql b/src_sql/view/vi_rent_collect.sql new file mode 100644 index 000000000..9e1231640 --- /dev/null +++ b/src_sql/view/vi_rent_collect.sql @@ -0,0 +1,57 @@ +create view as ( + SELECT + `lrp`.`ID` AS `id`, + `lci`.`ID` AS `contract_id`, + `lci`.`BUSINESSTYPE` AS `businesstype`, + `lci`.`SUBJECTID` AS `subjectid`, + `lci`.`SUBJECTNAME` AS `subjectname`, + `lci`.`distributor_id` AS `distributor_id`, + `lci`.`CONTRACT_NUMBER` AS `contract_number`, + `lrp`.`PAYMENT_NUMBER` AS `payment_number`, + IFNULL(`lul`.`CUSTOMER_NAME`,'') AS `customername`, + `ca`.`acc_number` AS `acc_number`, + `ca`.`collect_type` AS `collect_type`, + `lrp`.`PLAN_LIST` AS `plan_list`, + `lrp`.`PLAN_DATE` AS `plan_date`, + IFNULL(`lrp`.`COLLECT_STATUS`,'未收款') AS `collect_status`, + `lrp`.`COLLECT_MSG` AS `collect_msg`, + `lrp`.`BATCH_STATUS` AS `BATCH_STATUS`, + `lrp`.`RENT` AS `rent`, + `lrp`.`CORPUS` AS `corpus`, + `lrp`.`INTEREST` AS `interest`, + `getRentPenalty`( +`lrp`.`PAYMENT_NUMBER`,`lrp`.`PLAN_LIST`,DATE_FORMAT(NOW(),'%Y/%m/%d')) AS `penalty`, + (`lrp`.`RENT` - (IFNULL(`lcfd`.`rent`,0) + IFNULL(`lcfi`.`rent`,0))) AS `rent_over`, + (`lrp`.`CORPUS` - (((IFNULL(`lcfd`.`corpus`,0) + IFNULL(`lcfi`.`corpus`,0)) + IFNULL(`lcfd`.`corpus_adjust`,0)) + IFNULL(`lcfi`.`corpus_adjust`,0))) AS `corpus_over`, + (`lrp`.`INTEREST` - (((IFNULL(`lcfd`.`interest`,0) + IFNULL(`lcfi`.`interest`,0)) + IFNULL(`lcfd`.`interest_adjust`,0)) + IFNULL(`lcfi`.`interest_adjust`,0))) AS `interest_over`, + ROUND((`getRentPenalty`(`lrp`.`PAYMENT_NUMBER`,`lrp`.`PLAN_LIST`,DATE_FORMAT(NOW(),'%Y/%m/%d')) - ((IFNULL(`lcfd`.`penalty`,0) + IFNULL(`lcfi`.`penalty`,0)) + (IFNULL(`lcfd`.`penalty_adjust`,0) + IFNULL(`lcfi`.`penalty_adjust`,0)))),2) AS `penalty_over` +FROM (((((`apzl`.`lc_rent_plan` `lrp` + LEFT JOIN `apzl`.`lb_contract_info` `lci` + ON ((`lrp`.`CONTRACT_ID` = `lci`.`ID`))) + LEFT JOIN `apzl`.`lb_union_lessee` `lul` + ON (((`lrp`.`CONTRACT_ID` = `lul`.`CONTRACT_ID`) + AND (`lul`.`IS_MAIN` = 'Y')))) + LEFT JOIN `apzl`.`lc_rent_income_transfer` `lcfd` + ON (((`lrp`.`PAYMENT_NUMBER` = `lcfd`.`payment_number`) + AND (`lrp`.`PLAN_LIST` = `lcfd`.`plan_list`)))) + LEFT JOIN `apzl`.`lc_rent_income_temp_transfer` `lcfi` + ON (((`lrp`.`PAYMENT_NUMBER` = `lcfi`.`payment_number`) + AND (`lrp`.`PLAN_LIST` = `lcfi`.`plan_list`)))) + LEFT JOIN (SELECT DISTINCT + `apzl`.`customer_account`.`CONTRACT_ID` AS `contract_id`, + `apzl`.`customer_account`.`acc_number` AS `acc_number`, + `apzl`.`customer_account`.`collect_type` AS `collect_type` + FROM `apzl`.`customer_account`) `ca` + ON ((`ca`.`contract_id` = `lci`.`ID`))) +WHERE ((`lci`.`CONTRACT_STATUS` = '31') + AND (`lci`.`BUSINESSTYPE` = '1') + AND (NOT(EXISTS(SELECT + 1 + FROM `apzl`.`lc_occupy_rent_list` `lorl` + WHERE ((`lorl`.`PAYMENT_NUMBER` = `lrp`.`PAYMENT_NUMBER`) + AND ((lorl.plan_id=lrp.id + AND (`lorl`.`FLOW_NAME` IN('微信银联收款','微信支付收款','网银收款'))) + OR lorl.flow_name IN ('合同中途终止') + ) + ))))) +); \ No newline at end of file diff --git a/src_sql/view/vi_rent_collect_4_ebank.sql b/src_sql/view/vi_rent_collect_4_ebank.sql new file mode 100644 index 000000000..803462971 --- /dev/null +++ b/src_sql/view/vi_rent_collect_4_ebank.sql @@ -0,0 +1,55 @@ +create view as ( + SELECT + `lrp`.`ID` AS `id`, + `lci`.`ID` AS `contract_id`, + `lci`.`BUSINESSTYPE` AS `businesstype`, + `lci`.`SUBJECTID` AS `subjectid`, + `lci`.`SUBJECTNAME` AS `subjectname`, + `lci`.`distributor_id` AS `distributor_id`, + `lci`.`CONTRACT_NUMBER` AS `contract_number`, + `lrp`.`PAYMENT_NUMBER` AS `payment_number`, + IFNULL(`lul`.`CUSTOMER_NAME`,'') AS `customername`, + `ca`.`acc_number` AS `acc_number`, + `lrp`.`PLAN_LIST` AS `plan_list`, + `lrp`.`PLAN_DATE` AS `plan_date`, + IFNULL(`lrp`.`COLLECT_STATUS`,'未收款') AS `collect_status`, + `lrp`.`COLLECT_MSG` AS `collect_msg`, + `lrp`.`BATCH_STATUS` AS `BATCH_STATUS`, + `lrp`.`RENT` AS `rent`, + `lrp`.`CORPUS` AS `corpus`, + `lrp`.`INTEREST` AS `interest`, + (`lrp`.`RENT` - (IFNULL(`lcfd`.`rent`,0) + IFNULL(`lcfi`.`rent`,0))) AS `rent_over`, + (`lrp`.`CORPUS` - (((IFNULL(`lcfd`.`corpus`,0) + IFNULL(`lcfi`.`corpus`,0)) + IFNULL(`lcfd`.`corpus_adjust`,0)) + IFNULL(`lcfi`.`corpus_adjust`,0))) AS `corpus_over`, + (`lrp`.`INTEREST` - (((IFNULL(`lcfd`.`interest`,0) + IFNULL(`lcfi`.`interest`,0)) + IFNULL(`lcfd`.`interest_adjust`,0)) + IFNULL(`lcfi`.`interest_adjust`,0))) AS `interest_over`, + ROUND((((IFNULL(`lcfd`.`penalty`,0) + IFNULL(`lcfi`.`penalty`,0)) + (IFNULL(`lcfd`.`penalty_adjust`,0) + IFNULL(`lcfi`.`penalty_adjust`,0)))),2) AS `penalty_sum` +FROM (((((`apzl`.`lc_rent_plan` `lrp` + LEFT JOIN `apzl`.`lb_contract_info` `lci` + ON ((`lrp`.`CONTRACT_ID` = `lci`.`ID`))) + LEFT JOIN `apzl`.`lb_union_lessee` `lul` + ON (((`lrp`.`CONTRACT_ID` = `lul`.`CONTRACT_ID`) + AND (`lul`.`IS_MAIN` = 'Y')))) + LEFT JOIN `apzl`.`lc_rent_income_transfer` `lcfd` + ON (((`lrp`.`PAYMENT_NUMBER` = `lcfd`.`payment_number`) + AND (`lrp`.`PLAN_LIST` = `lcfd`.`plan_list`)))) + LEFT JOIN `apzl`.`lc_rent_income_temp_transfer` `lcfi` + ON (((`lrp`.`PAYMENT_NUMBER` = `lcfi`.`payment_number`) + AND (`lrp`.`PLAN_LIST` = `lcfi`.`plan_list`)))) + LEFT JOIN (SELECT DISTINCT + `apzl`.`customer_account`.`CONTRACT_ID` AS `contract_id`, + `apzl`.`customer_account`.`acc_number` AS `acc_number`, + `apzl`.`customer_account`.`collect_type` AS `collect_type` + FROM `apzl`.`customer_account`) `ca` + ON ((`ca`.`contract_id` = `lci`.`ID`))) +WHERE ((`lci`.`CONTRACT_STATUS` = '31') + AND + (NOT(EXISTS(SELECT + 1 + FROM `apzl`.`lc_occupy_rent_list` `lorl` + WHERE ((`lorl`.`PAYMENT_NUMBER` = `lrp`.`PAYMENT_NUMBER`) + AND ((lorl.plan_id=lrp.id + AND (`lorl`.`FLOW_NAME` IN('微信银联收款','微信支付收款','网银收款'))) + OR lorl.flow_name IN ('合同中途终止') + ) + )))) + ) +); \ No newline at end of file diff --git a/src_sql/鎶曚骇SQL/v20201022/zhangbb20201022.sql b/src_sql/鎶曚骇SQL/v20201022/zhangbb20201022.sql new file mode 100644 index 000000000..00a7c1f36 --- /dev/null +++ b/src_sql/鎶曚骇SQL/v20201022/zhangbb20201022.sql @@ -0,0 +1,53 @@ +-- VILCRentPlanList模板 +delete from AWE_DO_CATALOG where dono='VILCRentPlanList'; +delete from awe_do_library where dono='VILCRentPlanList'; +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('VILCRentPlanList','租金计划视图表',null,'30120',null,'1','1','default','jbo.loan.VI_RENT_COLLECT_4_EBANK','O left join jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO lcl on O.contract_id=lcl.contract_id','O.businesstype=:businessType and O.subjectid=:subjectId and (O.batch_status<>''process'' or O.batch_status is null) and v.DATE_FORMAT(O.plan_date,''%Y%m'') <= v.DATE_FORMAT(v.SYSDATE(),''%Y%m'') and rent_over>0','','','com.tenwa.flow.rent.rentincome.VILCRentPlanListHandler',null,'SYS_Designer','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1000','1000','1','O','id','id','String','','租金计划编号','','1','Text','1','1','','','','20','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1010','1010','1','O','contract_number','contract_number','String','','业务合同号','','1','Text','1','1','','','','32','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','0','','1','','','','Equals,Like'); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1020','1020','1','O','payment_number','payment_number','String','','投放编号','','1','Text','1','1','','','','20','0','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1030','1030','1','O','customername','customername','String','','客户名称','','1','Text','1','1','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','0','','1','','','','Equals,Like'); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1050','1050','1','O','plan_list','plan_list','String','','期次','','1','Text','1','1','','','','20','1','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1060','1060','1','O','plan_date','plan_date','String','','计划日期','','1','Date','3','1','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','0','','1','','','','BigThan,LessThan,Area'); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1070','1070','1','O','rent','rent','Number','','计划租金','','1','Text','2','3','','','','20','1','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1080','1080','1','O','corpus','corpus','Number','','计划本金','','1','Text','2','3','','','','20','1','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1090','1090','1','O','interest','interest','Number','','计划利息','','1','Text','2','3','','','','20','1','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1095','1095','1','','''''','penalty','Number','','应收罚息','','1','Text','2','3','','','','20','1','0','0','1','0',1,'0','','','SYS_Designer','2017/06/26 19:22:54','SYS_Designer','2020/10/10 18:10:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1180','1180','1','O','rent_over','rent_over','Number','','租金余额','','1','Text','2','3','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1190','1190','1','O','corpus_over','corpus_over','Number','','本金余额','','1','Text','2','3','','','','20','1','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1200','1200','1','O','interest_over','interest_over','Number','','利息余额','','1','Text','2','3','','','','20','1','0','0','1','0',1,'0','','','SYS_DESIGNER','2017/06/04 20:29:52','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1210','1310','1','O','penalty_sum','penalty_sum','Number','','已收罚息金额','','1','Text','2','1','','','',null,'0','0','0','1','0',0,'','','','SYS_Designer','2020/10/10 18:10:58','SYS_Designer','2020/10/10 18:12:27','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1220','1220','1','','''''','planstatus','String','','回笼状态','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2017/06/26 12:26:39','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1250','1210','1','','''''','penalty_over','Number','','罚息余额','','1','Text','2','3','','','','20','1','0','0','1','0',1,'0','','','SYS_Designer','2017/06/26 19:38:10','SYS_Designer','2020/10/10 18:10:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1270','1270','1','','''''','all_over','Number','','剩余应还金额','','1','Text','2','3','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/04/02 11:17:52','SYS_Designer','2020/10/10 18:10:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('VILCRentPlanList','1290','1290','1','lcl','plate_number','plate_number','String','','车牌号','','1','Text','1','1','','','',null,'1','0','0','1','1',0,'','','','SYS_Designer','2020/04/02 11:52:35','SYS_Designer','2020/10/10 18:10:58','','','1','','','','Like'); + +-- ViLcReviewAuditRentPlanList3模板 +delete from AWE_DO_CATALOG where dono='ViLcReviewAuditRentPlanList3'; +delete from awe_do_library where dono='ViLcReviewAuditRentPlanList3'; +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('ViLcReviewAuditRentPlanList3','手工卡扣',null,'30030',null,'1','1','default','jbo.loan.VI_RENT_COLLECT','O','(O.rent_over>0 or penalty_over>0) and O.BUSINESSTYPE=''1'' and O.collect_status IN (''未收款'',''部分收款'',''代偿'') and v.date_format(O.PLAN_DATE,''%Y/%m/%d'') <= v.date_format(v.sysdate(),''%Y/%m/%d'')','','','com.tenwa.lease.flow.rent.rentreback.VILCRentCollectHandler',null,'SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','','1',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1000','1000','1','O','id','id','String','','id','','1','Text','1','1','','','','20','0','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1005','1005','1','O','SUBJECTNAME','SUBJECTNAME','String','','主体名称','','1','Text','1','1','','','','20','1','1','0','0','0',0,'','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1020','1010','1','O','contract_number','contract_number','String','','合同编号','','1','Text','1','1','','','','32','1','1','0','1','1',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','0','','1','','','','Like,Equals'); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1040','1029','1','O','plan_list','plan_list','String','','期次','','1','Text','1','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1050','1030','1','O','plan_date','plan_date','String','','计划日期','','1','Date','3','2','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1060','1031','1','O','rent','rent','Number','','租金','','1','Text','2','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1070','1032','1','O','corpus','corpus','Number','','本金','','1','Text','2','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1080','1033','1','O','interest','interest','Number','','利息','','1','Text','2','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1090','1040','1','O','rent_over','rent_over','Number','','未付租金','','1','Text','2','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1100','1050','1','O','corpus_over','corpus_over','Number','','未付本金','','1','Text','2','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1110','1060','1','O','interest_over','interest_over','Number','','未付利息','','1','Text','2','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1150','1023','1','O','acc_number','acc_number','String','','银行账号','','1','Text','1','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1190','1025','1','O','COLLECT_STATUS','COLLECT_STATUS','String','','收付状态','','1','Text','1','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1200','1027','1','O','COLLECT_MSG','COLLECT_MSG','String','','收付信息','','1','Text','1','1','','','','20','1','1','0','1','0',1,'0','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1230','1460','1','O','BATCH_STATUS','BATCH_STATUS','String','','批量处理状态','','1','Text','','1','','','','20','1','1','0','1','0',0,'','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1240','1020','1','O','CUSTOMERNAME','CUSTOMERNAME','String','','承租人','','1','Text','1','1','','','',null,'1','1','0','1','1',0,'','','','SYS_Designer','2020/08/03 16:54:59','SYS_Designer','2020/09/29 15:23:57','0','','1','','','','Like,Equals'); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1300','1035','1','O','penalty','penalty','Number','','罚息','','1','Text','2','1','','','','20','1','1','0','1','0',0,'','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1360','1070','1','','''''','back_rent','Number','','本期剩余应还金额','','1','Text','2','1','','','',null,'1','1','0','1','0',0,'','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1430','1430','1','O','SUBJECTID','SUBJECTID','String','','主体id','','1','Text','1','1','','','','20','0','1','0','1','0',0,'','','','SYS_Designer','2020/08/03 16:55:00','SYS_Designer','2020/09/29 15:23:58','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1500','1075','1','','''''','collect_money','Number','','扣款金额','','1','Text','2','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/08/05 15:14:20','SYS_Designer','2020/09/29 15:23:58','','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('ViLcReviewAuditRentPlanList3','1570','1065','1','O','penalty_over','penalty_over','Number','','未付罚息','','1','Text','2','1','','','',null,'1','1','0','1','0',0,'','','','SYS_Designer','2020/09/27 09:48:31','SYS_Designer','2020/09/29 15:23:57','','','1','','','',''); + +-- customer_account 新增collect_type字段 +alter table customer_account add collect_type varchar(10); + +-- diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java index 23f9d732c..5aab12dde 100644 --- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java +++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java @@ -32,6 +32,7 @@ import com.gnete.security.crypt.Crypt; import com.gnete.security.crypt.CryptException; import com.tenwa.comm.util.date.DateAssistant; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.lease.app.allinpay.service.impl.AllinpayPaymentDo; import com.tenwa.quartz.DateUtil; import jbo.app.tenwa.calc.LC_COLLECT_MANUAL_INFO; @@ -853,15 +854,24 @@ public class CollectAuditInfoCacheTj { } } BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME); - - List bolist = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false); - if (bolist.size() != 0) { - for(BizObject bo:bolist){ + List bolistTL = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and collect_type='TLcollect' and O.id in ("+parms.toString()+")").getResultList(false); + List bolistYL = bm.createQuery("select distinct O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and collect_type='YLcollect' and O.id in ("+parms.toString()+")").getResultList(false); + if (bolistTL.size() != 0) { + AllinpayPaymentDo apd = new AllinpayPaymentDo(); + for(BizObject bo:bolistTL){ String plan_id = bo.getAttribute("id").toString(); bo.setAttributeValue("rent", object.get(plan_id)); } - singleBatchCollectMoeny(tx, bolist); + apd.BatchCollectMoeny(tx, bolistTL); } + if (bolistYL.size() != 0) { + for(BizObject bo:bolistYL){ + String plan_id = bo.getAttribute("id").toString(); + bo.setAttributeValue("rent", object.get(plan_id)); + } + singleBatchCollectMoeny(tx, bolistYL); + } + return "发起扣款申请成功！"; } /** diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java b/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java index f8512ba65..e07fa961d 100644 --- a/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java +++ b/src_tenwa/com/tenwa/flow/rent/rentincome/VILCRentPlanListHandler.java @@ -1,39 +1,37 @@ -package com.tenwa.flow.rent.rentincome; - -import java.math.BigDecimal; - -import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.dw.handler.impl.CommonHandler; - -public class VILCRentPlanListHandler extends CommonHandler{ - - @Override - protected void initDisplayForEdit(BizObject bo) throws Exception { - String factDate = this.asPage.getAttribute("fact_date"); - String penalty = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME) - .createQuery("select v.round(v.getRentPenalty('"+bo.getAttribute("payment_number").getString()+"','"+bo.getAttribute("plan_list").getString()+"','"+factDate+"'),2) as v.penalty from O").getSingleResult(false).getAttribute("penalty").getString(); - BizObject boVLRP = JBOFactory.createBizObjectQuery(VI_LC_RENT_PLAN.CLASS_NAME, "select fact_rent,fact_penalty,rent_over,v.round(v.getRentPenalty(payment_number,plan_list,'"+factDate+"')-fact_penalty-penalty_adjust,2) as v.pOver from O where O.id=:planID").setParameter("planID", bo.getAttribute("id").getString()) - .getSingleResult(false); - double factMOney = boVLRP.getAttribute("fact_rent").getDouble(); - double rentOver = boVLRP.getAttribute("rent_over").getDouble(); - double pOver = boVLRP.getAttribute("pOver").getDouble(); - double factPenalty = boVLRP.getAttribute("fact_penalty").getDouble(); - if(factMOney == 0 && factPenalty == 0){ - bo.setAttributeValue("planstatus", "未回笼"); - }else if(rentOver == 0 && pOver == 0){ - bo.setAttributeValue("planstatus", "已回笼"); - }else{ - bo.setAttributeValue("planstatus", "部分回笼"); - } - bo.setAttributeValue("fact_date", factDate); - bo.setAttributeValue("penalty", new BigDecimal(penalty).setScale(2)); - BigDecimal penalty_over = new BigDecimal(penalty).subtract(new BigDecimal(bo.getAttribute("fact_penalty").getString())).subtract(new BigDecimal(bo.getAttribute("penalty_adjust").getString())).setScale(2); - bo.setAttributeValue("penalty_over", penalty_over); - BigDecimal all_over = BigDecimal.valueOf(rentOver).add(penalty_over); - bo.setAttributeValue("all_over", all_over); - } -} +package com.tenwa.flow.rent.rentincome; + +import java.math.BigDecimal; + +import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; + +public class VILCRentPlanListHandler extends CommonHandler{ + + @Override + protected void initDisplayForEdit(BizObject bo) throws Exception { + String factDate = this.asPage.getAttribute("fact_date"); + String penalty = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME) + .createQuery("select v.round(v.getRentPenalty('"+bo.getAttribute("payment_number").getString()+"','"+bo.getAttribute("plan_list").getString()+"','"+factDate+"'),2) as v.penalty from O").getSingleResult(false).getAttribute("penalty").getString(); + double rent = bo.getAttribute("rent").getDouble(); + double penalty_sum = bo.getAttribute("penalty_sum").getDouble(); + double pOver = Double.parseDouble(penalty)-penalty_sum; + double rentOver = bo.getAttribute("rent_over").getDouble(); + if(rent == rentOver && penalty_sum == 0){ + bo.setAttributeValue("planstatus", "未回笼"); + }else if(rentOver == 0 && pOver == 0){ + bo.setAttributeValue("planstatus", "已回笼"); + }else{ + bo.setAttributeValue("planstatus", "部分回笼"); + } + // bo.setAttributeValue("fact_date", factDate); + bo.setAttributeValue("penalty", new BigDecimal(penalty).setScale(2)); + BigDecimal penalty_over = new BigDecimal(penalty).subtract(BigDecimal.valueOf(penalty_sum)).setScale(2, BigDecimal.ROUND_HALF_UP); + bo.setAttributeValue("penalty_over", penalty_over); + BigDecimal all_over = BigDecimal.valueOf(rentOver).add(penalty_over); + bo.setAttributeValue("all_over", all_over); + } +} diff --git a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCSplitCHargeHandler.java b/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCSplitCHargeHandler.java deleted file mode 100644 index 3fc3d3d70..000000000 --- a/src_tenwa/com/tenwa/lease/flow/rent/rentreback/VILCSplitCHargeHandler.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.tenwa.lease.flow.rent.rentreback; - -import java.math.BigDecimal; - -import jbo.app.tenwa.calc.LC_RENT_PLAN; -import jbo.app.tenwa.calc.VI_LC_RENT_PLAN; -import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; - -import com.amarsoft.are.jbo.BizObject; -import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.awe.dw.handler.impl.CommonHandler; - -public class VILCSplitCHargeHandler extends CommonHandler{ - - @Override - protected void initDisplayForEdit(BizObject bo) throws Exception { - String contractId = bo.getAttribute("contract_id").toString(); - String splitting_money = bo.getAttribute("splitting_money").toString(); - int planList = bo.getAttribute("plan_list").getInt(); - String lrpSql = "select v.sum(v.ifnull(interest_sp,0)) as v.interest_sp from O where contract_id=:contract_id group by contract_id"; - BizObject lrpBo = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME).createQuery(lrpSql).setParameter("contract_id", contractId).getSingleResult(false); - double interest_sp = 0; - if(lrpBo!=null&&lrpBo.getAttribute("interest_sp")!=null){ - interest_sp = lrpBo.getAttribute("interest_sp").getDouble(); - } - - int chargeList = 0; - int i=1; - for(;i<=4;i++){ - chargeList = bo.getAttribute("charge_"+i).getInt(); - - if(planList