diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp index 6ce44b1c4..898582bcc 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp @@ -2,6 +2,7 @@ <%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> <%@page import="jbo.sys.CODE_LIBRARY"%> <%@page import="jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT"%> +<%@ page import="com.tenwa.flow.lease.check.contract.IsNullCheck" %> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% @@ -32,6 +33,13 @@ } } ASObjectModel doTemp = new ASObjectModel("VILCFundPlanListtradition"); + //检验客户名称是否为经销商 + IsNullCheck inc = new IsNullCheck(); + inc.setFlowUnid(flowunid); + String resultTemp = inc.CustomerIdIsNullCheckTemp(); + if(resultTemp.startsWith("DSTB")){ + doTemp.appendJboWhere(" O.distributor_id='"+resultTemp+"'"); + } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- //dwTemp.MultiSelect = true; //多选 diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/VILCRentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/VILCRentPlanList.jsp index 7e6f03093..aa52e6334 100644 --- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/VILCRentPlanList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/VILCRentPlanList.jsp @@ -2,6 +2,7 @@ <%@page import="jbo.app.tenwa.calc.LC_EBANK_TEMP"%> <%@page import="jbo.sys.CODE_LIBRARY"%> <%@page import="jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT"%> +<%@ page import="com.tenwa.flow.lease.check.contract.IsNullCheck" %> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% @@ -35,6 +36,13 @@ } } ASObjectModel doTemp = new ASObjectModel("VILCRentPlanList"); + //检验客户名称是否为经销商 + IsNullCheck inc = new IsNullCheck(); + inc.setFlowUnid(flowunid); + String resultTemp = inc.CustomerIdIsNullCheckTemp(); + if(resultTemp.startsWith("DSTB")){ + doTemp.appendJboWhere(" O.distributor_id='"+resultTemp+"'"); + } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 6620e1c5a..e39605ba9 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -1881,6 +1881,7 @@ + @@ -1910,6 +1911,7 @@ + diff --git a/src/com/amarsoft/dict/als/manage/NameManager.java b/src/com/amarsoft/dict/als/manage/NameManager.java index 259b4caf5..ad9a0e04f 100644 --- a/src/com/amarsoft/dict/als/manage/NameManager.java +++ b/src/com/amarsoft/dict/als/manage/NameManager.java @@ -191,6 +191,16 @@ public class NameManager { return NameCache.getName("jbo.app.tenwa.customer.CUSTOMER_INFO", "CustomerName", "CustomerID", sCustomerID); } + + public static String getOwnName(String sCustomerID) throws Exception{ + if(sCustomerID.startsWith("DSTB")){ + return NameCache.getName("jbo.app.tenwa.customer.DISTRIBUTOR_INFO", "DISTRIBUTOR_NAME", "DISTRIBUTOR_NO", sCustomerID); + }else{ + return NameCache.getName("jbo.app.tenwa.customer.CUSTOMER_INFO", "CustomerName", "CustomerID", sCustomerID); + } + + + } public static String getCustomerNumber(String sCustomerID) throws Exception diff --git a/src_jbo/jbo/app/tenwa/calc/VI_LC_FUND_PLAN.java b/src_jbo/jbo/app/tenwa/calc/VI_LC_FUND_PLAN.java index 590c87d68..fa89f4b39 100644 --- a/src_jbo/jbo/app/tenwa/calc/VI_LC_FUND_PLAN.java +++ b/src_jbo/jbo/app/tenwa/calc/VI_LC_FUND_PLAN.java @@ -30,6 +30,10 @@ public interface VI_LC_FUND_PLAN{ */ public static final String subjectid = "subjectid"; /** + * 经销商ID STRING(20)
+ */ + public static final String distributor_id = "distributor_id"; + /** * 合同状态 STRING(20)
*/ public static final String contract_status = "contract_status"; diff --git a/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java b/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java index 8dfb4bbcf..a07dc40d2 100644 --- a/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java +++ b/src_jbo/jbo/app/tenwa/calc/VI_LC_RENT_PLAN.java @@ -38,6 +38,10 @@ public interface VI_LC_RENT_PLAN{ */ public static final String subjectid = "subjectid"; /** + * 经销商ID STRING(20)
+ */ + public static final String distributor_id = "distributor_id"; + /** * 投放编号 STRING(20)
*/ public static final String payment_number = "payment_number"; diff --git a/src_sql/鎶曚骇SQL/v20200915/zhangbb0915.sql b/src_sql/鎶曚骇SQL/v20200915/zhangbb0915.sql index 7d9b2a9c8..fd5deecf6 100644 --- a/src_sql/鎶曚骇SQL/v20200915/zhangbb0915.sql +++ b/src_sql/鎶曚骇SQL/v20200915/zhangbb0915.sql @@ -74,17 +74,17 @@ create table lb_producttocompany_info ( city varchar (20) ); -create table `lc_company_loan_info` ( - `id` varchar (32), - `contract_id` varchar (32), - `product_id` varchar (32), - `f_plan_id` varchar (32), - `f_income_id` varchar (32), - `car_money_had` varchar (10), - `handling_charge_money_had` varchar (10), - `PURCHASE_TAX_had` varchar (10), - `INSURANCE_PREMIUM_had` varchar (10), - `INCIDENTAL_had` varchar (10) +create table lc_company_loan_info ( + id varchar (32), + contract_id varchar (32), + product_id varchar (32), + f_plan_id varchar (32), + f_income_id varchar (32), + car_money_had varchar (10), + handling_charge_money_had varchar (10), + PURCHASE_TAX_had varchar (10), + INSURANCE_PREMIUM_had varchar (10), + INCIDENTAL_had varchar (10) ); -- 关联公司 模板 @@ -175,4 +175,107 @@ Insert Into AWE_Role_Menu (roleid,menuid) Values ('401','3000100181'); ALTER TABLE LC_FUND_INCOME_TEMP ADD isCompany VARCHAR(2) COMMENT '是否关联公司'; ALTER TABLE LC_FUND_INCOME ADD isCompany VARCHAR(2) COMMENT '是否关联公司'; +-- 网银客户名称新增经销商 +-- 网银信息模板 +UPDATE awe_do_library SET colactualname='NameManager.getOwnName(CUSTOMER_ID)' WHERE dono='LCEbankTempInfo' AND colindex='1096' AND colname='CUSTOMER_NAME'; +UPDATE awe_do_library SET colactualname='NameManager.getOwnName(CUSTOMER_ID)' WHERE dono='FundCollectionFlowStart' AND colindex='1366' AND colname='customer_name'; + +-- vi_lc_rent_plan视图 +DELIMITER $$ + +ALTER ALGORITHM=UNDEFINED DEFINER=apzl@% SQL SECURITY DEFINER VIEW vi_lc_rent_plan AS +SELECT + lcf.ID AS id, + lbc.PROJECT_ID AS project_id, + lbc.ID AS contract_id, + lbc.CONTRACT_STATUS AS contract_status, + lbc.BUSINESSTYPE AS businesstype, + lbc.SUBJECTID AS subjectid, + lbc.distributor_id AS distributor_id, + lbc.CONTRACT_NUMBER AS contract_number, + lcf.PAYMENT_NUMBER AS payment_number, + IFNULL(lbu.customername,'') AS customername, + lbc.PROJECT_NAME AS project_name, + lcf.PLAN_LIST AS plan_list, + lcf.PLAN_DATE AS plan_date, + lcf.RENT AS rent, + lcf.CORPUS AS corpus, + lcf.INTEREST AS interest, + getRentPenalty( +lcf.PAYMENT_NUMBER,lcf.PLAN_LIST,DATE_FORMAT(NOW(),'%Y/%m/%d')) AS penalty, + (IFNULL(lcfd.rent,0) + IFNULL(lcfi.rent,0)) AS fact_rent, + (IFNULL(lcfd.corpus,0) + IFNULL(lcfi.corpus,0)) AS fact_corpus, + (IFNULL(lcfd.interest,0) + IFNULL(lcfi.interest,0)) AS fact_interest, + (IFNULL(lcfd.penalty,0) + IFNULL(lcfi.penalty,0)) AS fact_penalty, + (IFNULL(lcfd.corpus_adjust,0) + IFNULL(lcfi.corpus_adjust,0)) AS corpus_adjust, + (IFNULL(lcfd.interest_adjust,0) + IFNULL(lcfi.interest_adjust,0)) AS interest_adjust, + (IFNULL(lcfd.penalty_adjust,0) + IFNULL(lcfi.penalty_adjust,0)) AS penalty_adjust, + (lcf.RENT - (IFNULL(lcfd.rent,0) + IFNULL(lcfi.rent,0))) AS rent_over, + (lcf.CORPUS - (((IFNULL(lcfd.corpus,0) + IFNULL(lcfi.corpus,0)) + IFNULL(lcfd.corpus_adjust,0)) + IFNULL(lcfi.corpus_adjust,0))) AS corpus_over, + (lcf.INTEREST - (((IFNULL(lcfd.interest,0) + IFNULL(lcfi.interest,0)) + IFNULL(lcfd.interest_adjust,0)) + IFNULL(lcfi.interest_adjust,0))) AS interest_over, + ROUND((getRentPenalty(lcf.PAYMENT_NUMBER,lcf.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, + (CASE WHEN (((IFNULL(lcfd.rent,0) + IFNULL(lcfi.rent,0)) = lcf.RENT) AND (ROUND((getRentPenalty(lcf.PAYMENT_NUMBER,lcf.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) = '0.00')) THEN '已回笼' WHEN ((IFNULL(lcfd.rent,0) + IFNULL(lcfi.rent,0)) > 0) THEN '部分回笼' ELSE '未回笼' END) AS planstatus +FROM (((((lc_rent_plan lcf + LEFT JOIN lb_contract_info lbc + ON ((lcf.CONTRACT_ID = lbc.ID))) + LEFT JOIN lc_calc_condition_status lccs + ON ((lccs.PAYMENT_NUMBER = lcf.PAYMENT_NUMBER))) + LEFT JOIN lb_union_lessee_transfer lbu + ON ((lcf.CONTRACT_ID = lbu.contract_id))) + LEFT JOIN lc_rent_income_transfer lcfd + ON (((lcf.PAYMENT_NUMBER = lcfd.payment_number) + AND (lcf.PLAN_LIST = lcfd.plan_list)))) + LEFT JOIN lc_rent_income_temp_transfer lcfi + ON (((lcf.PAYMENT_NUMBER = lcfi.payment_number) + AND (lcf.PLAN_LIST = lcfi.plan_list))))$$ + +DELIMITER ; + +-- vi_lc_fund_plan视图 +DELIMITER $$ + +ALTER ALGORITHM=UNDEFINED DEFINER=apzl@% SQL SECURITY DEFINER VIEW vi_lc_fund_plan AS +SELECT + lcf.ID AS id, + lbc.CONTRACT_NUMBER AS contract_number, + lbc.PROJECT_ID AS project_id, + lbc.ID AS contract_id, + lbc.BUSINESSTYPE AS businesstype, + lbc.SUBJECTID AS subjectid, + lbc.distributor_id AS distributor_id, + lbc.CONTRACT_STATUS AS contract_status, + lcf.PAYMENT_NUMBER AS payment_number, + lbc.PROJECT_NAME AS project_name, + IFNULL(lbu.customername,'') AS customername, + lcf.PAY_TYPE AS pay_type, + lcf.FEE_TYPE AS fee_type, + lcf.PLAN_LIST AS plan_list, + lcf.PLAN_DATE AS plan_date, + lcf.PLAN_MONEY AS plan_money, + (IFNULL(lcfd.fact_money,0) + IFNULL(lcfi.fact_money,0)) AS fact_money, + (IFNULL(lcfi.fee_adjust,0) + IFNULL(lcfd.fee_adjust,0)) AS fee_adjust, + (((IFNULL(lcfd.fact_money,0) + IFNULL(lcfi.fact_money,0)) + IFNULL(lcfi.fee_adjust,0)) + IFNULL(lcfd.fee_adjust,0)) AS allfact_money, + (lcf.PLAN_MONEY - (((IFNULL(lcfd.fact_money,0) + IFNULL(lcfi.fact_money,0)) + IFNULL(lcfi.fee_adjust,0)) + IFNULL(lcfd.fee_adjust,0))) AS overmoney +FROM ((((lc_fund_plan lcf + LEFT JOIN lb_contract_info lbc + ON ((lcf.CONTRACT_ID = CONVERT(lbc.ID USING utf8)))) + LEFT JOIN lb_union_lessee_f_transfer lbu + ON ((lcf.CONTRACT_ID = CONVERT(lbu.contract_id USING utf8)))) + LEFT JOIN lc_fund_income_transfer lcfd + ON (((lcf.PAYMENT_NUMBER = lcfd.payment_number) + AND (lcf.PAY_TYPE = lcfd.pay_type) + AND (lcf.FEE_TYPE = lcfd.fee_type) + AND (lcf.PLAN_LIST = lcfd.plan_list)))) + LEFT JOIN lc_fund_income_temp_transfer lcfi + ON (((lcf.PAYMENT_NUMBER = lcfi.payment_number) + AND (lcf.PAY_TYPE = lcfi.pay_type) + AND (lcf.FEE_TYPE = lcfi.fee_type) + AND (lcf.PLAN_LIST = lcfi.plan_list))))$$ + +DELIMITER ; + +-- 客户名称选择对话框 +delete from SELECT_CATALOG where selname='SelectCustomerByType'; +insert into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectCustomerByType','Sql','查询承租人名称（by客户类型）','customer_info','customerid','Grid','','customerid','select customerid,customer_num,customername,itemname from (select ci.customerid,ci.customer_num,ci.customername,cl.itemname from CUSTOMER_INFO ci left join CUSTOMER_TYPE ct on ci.customerid=ct.customerid left join code_library cl on cl.itemno=ci.customertype and cl.codeno=''CustomerType'' where ct.custtype = ''cust_type.cust'' and ct.custstatus=''status02'' union all select di.distributor_no as customerid,di.distributor_coding as customer_num,di.distributor_name as customername,''经销商'' as itemname FROM DISTRIBUTOR_INFO di) O where 1=1','客户ID,客户编号,客户名称,客户类型','','customerid@customername','customername','1','Single','','','','','O.customername@ @ @Contains','SYS_Designer','','2019/12/02 15:03:00','SYS_Designer','2020/08/18 10:37:53',''); + -- \ No newline at end of file diff --git a/src_tenwa/com/tenwa/flow/lease/check/contract/IsNullCheck.java b/src_tenwa/com/tenwa/flow/lease/check/contract/IsNullCheck.java index 384eac8c9..f63a7c93d 100644 --- a/src_tenwa/com/tenwa/flow/lease/check/contract/IsNullCheck.java +++ b/src_tenwa/com/tenwa/flow/lease/check/contract/IsNullCheck.java @@ -68,10 +68,10 @@ public class IsNullCheck { if(customerId==null||"".equals(customerId)){ return "Y"; }else{ - return "N"; + return customerId; } } - return "error"; + return "Y"; } public String getFlowUnid() {