From a1170e718106a41d26dd47cc7354ce46b7db58fd Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Thu, 18 Mar 2021 14:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E5=AE=A2=E6=88=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductConfig/ProductViewTree.jsp         |  2 +-
 .../BigdataBairong/BigdataBairongList.jsp     |  4 +--
 .../etc/app/component/component-config.xml    |  2 +-
 .../component/component-parameter-config.xml  |  2 +-
 src_sql/dailyfix/tft_dailyfix.sql             | 26 +++++++++++++++++++
 src_sql/view/vi_normalsettle_contract.sql     |  2 +-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp b/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp
index b9afc8a13..de32f9c27 100644
--- a/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp
+++ b/WebContent/ProductManage/ProductConfig/ProductViewTree.jsp
@@ -13,7 +13,7 @@
 	String condition ="";
 	String flag="false";
 	//80009U00000001为adminG（张俊创建账户）
-	if("administrator".equals(userid)||"admin".equals(userid)||"80009U00000001".equals(userid)){
+	if("administrator".equals(userid)||"admin".equals(userid)||"80009U00000001".equals(userid)||CurUser.hasRole("800R00000072")){
 		flag="true";
 	}else{
 		condition =ObjectWindowHelper.getProductList(userid);
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/BigdataBairong/BigdataBairongList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/BigdataBairong/BigdataBairongList.jsp
index bf5c50035..7687ad8d3 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/BigdataBairong/BigdataBairongList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/BigdataBairong/BigdataBairongList.jsp
@@ -20,7 +20,7 @@
 
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
-		{"true","All","Button","获取百融数据","获取百融数据","getBaironginfo()","","","","btn_icon_add",""}
+		{"true","","Button","获取百融数据","获取百融数据","getBaironginfo()","","","","btn_icon_add",""}
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -47,7 +47,7 @@
 		var dStatus = getItemValue(0,getRow(0),'dcode_status');
 		var yStatus = getItemValue(0,getRow(0),'dcode_statusv');
 		if("00" != dStatus || "00" != yStatus){
-			alert("数据为获取，请先获取数据！");
+			alert("数据未获取，请先获取数据！");
 			return;
 		}
 		var dFilePath = getItemValue(0,getRow(0),'file_path');
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 5e060ca48..af2356c5f 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1107,4 +1107,4 @@
 	<Component FORMAT="1" ID="even_corpus_day" NAME="等额本金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="car_even_interest" NAME="车辆均息法" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="even_corpus_period" NAME="等额本金按期计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component>
 	<Component FORMAT="1" ID="INCIDENTAL" NAME="杂费" PRODUCT_TYPE="car_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与融资（汽车专用）" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="None" VALUE="Y"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required" VALUE="EquipAmt"/></Parameters></Component>
 	<Component FORMAT="1" ID="FINAL_PAYMENT" NAME="尾款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/></Parameters></Component>
-	<Component FORMAT="1" ID="delay" NAME="还款延期" STATUS="2" TYPE="PRD0315"/><Component FORMAT="1" ID="period_type" NAME="先付/后付" STATUS="1" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="先付/后付" PARAMETERID="begin_end" PARAMETERNAME="先付/后付" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="OTHER_MONEY" NAME="其它" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="UNITE_MONEY" NAME="联合出资" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款（汽车专用）" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="IRR" NAME="IRR" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="IRR" PARAMETERID="IRR" PARAMETERNAME="IRR" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ChannelRating" NAME="渠道评级" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="渠道评级" PARAMETERID="ChannelRating" PARAMETERNAME="渠道评级" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="CustomerRating" NAME="客户评级" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="客户评级" PARAMETERID="CustomerRating" PARAMETERNAME="客户评级" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="CostInterestRate" NAME="成本利率" ROLES="超级管理员,平台管理员,系统管理员" ROLE_IDS="099,超级管理员,299,平台管理员,399,系统管理员" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="成本利率" PARAMETERID="CostInterestRate" PARAMETERNAME="成本利率" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="OperatingRate" NAME="运营费率" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="运营费率" PARAMETERID="OperatingRate" PARAMETERNAME="运营费率" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPSDifference" NAME="GPS差额" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="GPS差额" PARAMETERID="GPSDifference" PARAMETERNAME="GPS差额" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="RiskAccrualRatio" NAME="风险计提比率" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="风险计提比率" PARAMETERID="RiskAccrualRatio" PARAMETERNAME="风险计提比率" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="StrategicCoefficient" NAME="战略系数" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="战略系数" PARAMETERID="StrategicCoefficient" PARAMETERNAME="战略系数" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="StrategyROA" NAME="战略ROA" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="战略ROA" PARAMETERID="StrategyROA" PARAMETERNAME="战略ROA" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="bondAndPayments" NAME="保证金和首付款比例和" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证金和首付款比例和" PARAMETERID="bondAndPayments" PARAMETERNAME="保证金和首付款比例和" PRIGHTTYPE="Required"/></Parameters></Component></Components>
\ No newline at end of file
+	<Component FORMAT="1" ID="delay" NAME="还款延期" STATUS="2" TYPE="PRD0315"/><Component FORMAT="1" ID="period_type" NAME="先付/后付" STATUS="1" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="先付/后付" PARAMETERID="begin_end" PARAMETERNAME="先付/后付" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="OTHER_MONEY" NAME="其它" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="UNITE_MONEY" NAME="联合出资" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="是否差额放款" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款（汽车专用）" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="IRR" NAME="IRR" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="IRR" PARAMETERID="IRR" PARAMETERNAME="IRR" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ChannelRating" NAME="渠道评级" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="渠道评级" PARAMETERID="ChannelRating" PARAMETERNAME="渠道评级" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="CustomerRating" NAME="客户评级" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="客户评级" PARAMETERID="CustomerRating" PARAMETERNAME="客户评级" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="CostInterestRate" NAME="成本利率" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="成本利率" PARAMETERID="CostInterestRate" PARAMETERNAME="成本利率" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="OperatingRate" NAME="运营费率" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="运营费率" PARAMETERID="OperatingRate" PARAMETERNAME="运营费率" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPSDifference" NAME="GPS差额" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="GPS差额" PARAMETERID="GPSDifference" PARAMETERNAME="GPS差额" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="RiskAccrualRatio" NAME="风险计提比率" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="风险计提比率" PARAMETERID="RiskAccrualRatio" PARAMETERNAME="风险计提比率" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="StrategicCoefficient" NAME="战略系数" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="战略系数" PARAMETERID="StrategicCoefficient" PARAMETERNAME="战略系数" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="StrategyROA" NAME="战略ROA" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="战略ROA" PARAMETERID="StrategyROA" PARAMETERNAME="战略ROA" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="bondAndPayments" NAME="保证金和首付款比例和" ROLES="财务负责人" ROLE_IDS="800R00000072,财务负责人" STATUS="1" TYPE="PRD0390"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="保证金和首付款比例和" PARAMETERID="bondAndPayments" PARAMETERNAME="保证金和首付款比例和" PRIGHTTYPE="Required"/></Parameters></Component></Components>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
index 51376d906..ddad2d12f 100644
--- a/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
@@ -178,7 +178,7 @@
 	<Parameter CODESCRIPT="AssureRelation" CODESOURCE="Code" COMPONENTTYPE="PRD0386" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="Relationship" PARAMETERNAME="关系" SELECTTYPE="04" STATUS="1"/>
 	<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="SigningAddress" PARAMETERNAME="签约地点" STATUS="1"/>
 	<Parameter CODESCRIPT="InputType" CODESOURCE="Code" COMPONENTTYPE="PRD0315,PRD0380" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="InputType" PARAMETERNAME="残值输入方式" SELECTTYPE="04" STATUS="1"/>
-	<Parameter COMPONENTTYPE="PRD0390" DATATYPE="7" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE,MAXIMUMVALUE" PARAMETERID="IRR" PARAMETERNAME="IRR" STATUS="1"/>
+	<Parameter COMPONENTTYPE="PRD0390" DATATYPE="7" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE,MAXIMUMVALUE" PARAMETERID="IRR" PARAMETERNAME="IRR" STATUS="1" UNIT="%"/>
 	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="MoneyRatioUpLimits" PARAMETERNAME="贷款比例上限" STATUS="1" UNIT="&lt;font&gt;%&lt;/font&gt;"/>
 	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="MoneyLowLimits" PARAMETERNAME="融资额下限" STATUS="1" UNIT="&lt;font&gt;元&lt;/font&gt;"/>
 	<Parameter COMPONENTTYPE="PRD0350" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="MoneyUpLimits" PARAMETERNAME="融资额上限" STATUS="1" UNIT="&lt;font&gt;元&lt;/font&gt;"/>
diff --git a/src_sql/dailyfix/tft_dailyfix.sql b/src_sql/dailyfix/tft_dailyfix.sql
index 2f4526b2e..54f530561 100644
--- a/src_sql/dailyfix/tft_dailyfix.sql
+++ b/src_sql/dailyfix/tft_dailyfix.sql
@@ -29,6 +29,32 @@ insert into `BF_LABLECONFIG` (`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`,
 delete from FLOW_MODEL where FlowNo='AccountChangeFlow' and PhaseNo='1000';
 insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('AccountChangeFlow','1000','1040','结束',NULL,NULL,'!基础操作.新增业务消息提醒(#ObjectNo)+!审批流程.微信提交信息变更发起流程通过(#ObjectNo)+!基础操作.扣款卡信息变更到正式(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,'[{usertype:\"指定角色\",userinfo:\"800R00000016,业务二部运营专员初审\"}]',NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'153','267','50','50','1',NULL,'END',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 
+-- 同步放款后督根据部门选择合同和根据人员选择不一致
+delete from SELECT_CATALOG where selname='SelectLbContractInfoQC_KE';
+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 ('SelectLbContractInfoQC_KE','Sql','查询合同信息-抵押档案归档(kaer)','lb_contract_info','ID','Grid','String orgid','ID,PROJECT_ID,PRODUCT_ID,PROJECT_NAME','select lci.id as ID,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number  as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN=''Y'' WHERE (lci.contract_status>=31 and lci.contract_status<>104) AND lci.BUSINESSTYPE=''1'' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO) AND lci.inputorgid=''#orgid''','合同ID,项目ID,产品ID,合同号,项目名称,申请编号,客户名称','CONTRACT_NUMBER@style={width:200px;}@PROJECT_NAME@style={width:450px;}','ID@PROJECT_ID@PRODUCT_ID@CONTRACT_NUMBER@PROJECT_NAME','CONTRACT_NUMBER,project_no,customer_name','1','Single','','','','','','SYS_Designer','','2019/05/31 17:45:11','SYS_Designer','2021/03/02 11:30:39','');
+
+-- 修改租金红冲新增sql
+delete from SELECT_CATALOG where selname='SelectPaymentHavePenalty';
+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 ('SelectPaymentHavePenalty','Sql','查询已产生罚息的投放','LB_CONTRACT_INFO','ID','Grid','String businessType','id,project_id,product_id,PROJECT_NAME,PAYMENT_NUMBER,itemname','select lci.contract_number,lci.id,lci.project_id,lci.product_id,lci.PROJECT_NAME,lccs.PAYMENT_NUMBER,vlrp.rentover,vlrp.penaltyover,lul.customername,cl.itemname,ui.username,oi.orgname,lcs.STATUS_NAME from lb_contract_info lci left join lc_calc_condition_status lccs on lccs.contract_id = lci.id left join (select payment_number,SUM(rent_over) rentover,SUM(penalty_over) penaltyover from (
+SELECT lcf.PAYMENT_NUMBER  AS payment_number,
+(lcf.RENT - (IFNULL(lcfd.rent,0) + IFNULL(lcfi.rent,0))) AS rent_over,
+case when lcf.rent>IFNULL(lcfd.rent,0) then 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) else 0 end AS penalty_over
+FROM  lc_rent_plan lcf
+LEFT JOIN lb_contract_info lbc ON lcf.CONTRACT_ID = lbc.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 
+WHERE plan_date<DATE_FORMAT(NOW(),''%Y/%m/%d'')  
+) t where penalty_over>0 group by payment_number) vlrp on vlrp.payment_number = lccs.payment_number left join (select lu.contract_id,ci.customerid,ci.customername from LB_UNIon_LESSEE lu,CUSTOMER_INFO ci where lu.CUSTOMER_ID = ci.customerid and is_main = ''y'') as lul on lul.ConTRACT_ID = lci.id left join user_info ui on ui.userid = lci.PROJECT_MANAGE left join org_info oi on oi.orgid = lci.PROJECT_DEPT left join lb_contract_status lcs on lcs.STATUS_CODE = lccs.plan_status left join code_library cl on cl.itemno = lci.PROJECT_INDUSTRY and cl.codeno = ''cust_kind'' where lci.businesstype = ''1'' and lccs.PLAN_STATUS = ''31'' and vlrp.penaltyover > 0 and lccs.PAYMENT_NUMBER not in (select payment_number from lc_occupy_rent_list where flow_name not in(''网银收款'',''保证金抵扣流程'',''罚息减免流程''))','业务合同号,合同编号,项目编号,产品编号,项目名称,投放编号,租金余额,罚息余额,承租人,内部行业,经销商SP,经销商,投放状态','','id@product_id@project_id@PROJECT_NAME@PAYMENT_NUMBER@contract_number','contract_number,orgname,customername','1','Single','rentover@3@penaltyover@3','','penaltyover@2@rentover@2','','contract_number@ @ @Contains@orgname@ @ @Contains@customername@ @ @Contains','SYS_Designer','','2017/06/26 08:37:31','SYS_Designer','2021/03/03 16:27:33','');
 
 
+-- 生产环境已执行 ----------------------------------------------------------------
+
+-- 添加分润产品配置中条件查询
+delete from awe_do_library where dono='SplittingRatioList' and colindex='0020';
+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 ('SplittingRatioList','0020','0020','1','O','distributor_name','distributor_name','String','','经销商名称','','1','Text','1','1','','','',null,'1','1','0','1','1',0,'','','','SYS_Designer','2019/08/24 10:01:21','SYS_Designer','2021/03/15 15:31:13','0','','1','','','','Like');
+delete from awe_do_library where dono='SplittingRatioList' and colindex='0030';
+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 ('SplittingRatioList','0030','0030','1','O','product_name','product_name','String','','产品名称','','1','Text','1','1','','','',null,'1','1','0','1','1',0,'','','','SYS_Designer','2019/08/24 10:01:21','SYS_Designer','2021/03/15 15:31:14','0','','1','','','','Like');
+-- 修改分润产品配置中，选择产品的选择对话框
+delete from SELECT_CATALOG where selname='selectProductList';
+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 ('selectProductList','Sql','选择产品','business_type','typeno','Grid','','typeno','select typeno,typename from business_type where attribute2=''car_product''','产品编号,产品名称','typename@style={width:300px;}','typeno@typename','typename','1','Single','','','','','','SYS_Designer','','2019/08/24 10:35:24','SYS_Designer','2021/03/15 15:54:55','');
 
diff --git a/src_sql/view/vi_normalsettle_contract.sql b/src_sql/view/vi_normalsettle_contract.sql
index 41ddb7e6f..74dbeb10e 100644
--- a/src_sql/view/vi_normalsettle_contract.sql
+++ b/src_sql/view/vi_normalsettle_contract.sql
@@ -23,7 +23,7 @@ FROM (((`apzl`.`lb_contract_info` `lci`
    LEFT JOIN `apzl`.`lc_contract_condition` `lcc`
      ON ((`lcc`.`CONTRACT_ID` = `lci`.`ID`)))
 WHERE ((`lci`.`CONTRACT_STATUS` = '31')
-       AND ((`lri`.`rent` - `lrp`.`rent`) > 0)
+       AND ((`lri`.`rent` - `lrp`.`rent`) >= 0)
        AND (`lrp`.`PLAN_LIST` = `lcc`.`INCOME_NUMBER`)
        AND (`lri`.`PLAN_LIST` = `lcc`.`INCOME_NUMBER`))$$