From 9b87acc85f883a99ff51692b74bfaa287085c799 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 12 Jul 2018 20:42:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=A0=B9=E6=8D=AE=E9=97=AE=E9=A2=98=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp      | 4 ++--
 WebContent/WEB-INF/etc/app/component/component-config.xml     | 2 +-
 WebContent/WEB-INF/etc/app/component/componenttype-config.xml | 2 +-
 src_cmb/com/tenwa/sdk/controller/CmbToPayController.java      | 2 +-
 src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java  | 4 ++++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp
index 35e202936..5895360a4 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/FundPayment/VILCFundEquipAMTList.jsp
@@ -37,7 +37,7 @@
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
 	function openFundPlanList(){
-		var equipAMTID = getItemValue(0,getRow(0),"ID");
+		var equipAMTID = getItemValue(0,getRow(0),"ID"); 
 		if(equipAMTID == "" || !equipAMTID){
 			alert("请选择一条数据！");
 			return;
@@ -61,7 +61,7 @@
 			var result = RunJavaMethodTrans("com.tenwa.flow.fund.flowpayment.FundPayment","setEquipAMTPayment",
 					"flowunid=<%=flowunid%>,equipAMTID="+equipAMTID+",equipOverMoney="+equipOverMoney+",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
 			if("SUCCESS" == result){
-				alert("操作成功，请到本次付款明细查看！");
+				alert("操作成功！");
 				reloadSelf();
 			}else{
 				alert("操作失败！");
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index c34ad3fdb..22d9db1f2 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1105,4 +1105,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="杂费" 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="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/></Parameters></Component>
 	<Component FORMAT="1" ID="FINAL_PAYMENT" NAME="尾款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="All"/><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="1" TYPE="PRD0315"/><Component FORMAT="1" ID="period_type" NAME="期初/期末" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="期初/期末" PARAMETERID="begin_end" PARAMETERNAME="期初/期末" PRIGHTTYPE="Required"/></Parameters></Component></Components>
\ No newline at end of file
+	<Component FORMAT="1" ID="delay" NAME="还款延期" STATUS="1" TYPE="PRD0315"/><Component FORMAT="1" ID="period_type" NAME="期初/期末" STATUS="2" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="期初/期末" PARAMETERID="begin_end" PARAMETERNAME="期初/期末" PRIGHTTYPE="Required"/></Parameters></Component></Components>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
index 28d4d818e..460c0a202 100644
--- a/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/componenttype-config.xml
@@ -56,6 +56,6 @@
 	<ComponentType ID="PRD0384" NAME="联合出资信息" STATUS="2"/> 
 	<ComponentType ID="PRD0386" NAME="渠道方信息" STATUS="2"/> 
 	<ComponentType ID="PRD0412" NAME="资料清单" STATUS="1"/>
-	<ComponentType ID="PRD0403" NAME="文档模板" STATUS="1"/>
+	<ComponentType ID="PRD0403" NAME="文档模板" STATUS="2"/>
 	<ComponentType ID="PRD0414" NAME="流程附件" STATUS="1"/>
 </ComponentTypes>
\ No newline at end of file
diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
index d2a6fd7b9..b00d2e9ed 100644
--- a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
+++ b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
@@ -89,7 +89,7 @@ public class CmbToPayController extends BaseFlowStartAction {
 		 */
 		BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME);
 		List<BizObject> accountBoList = accountManager.createQuery("select o.id,o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join  jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and account_type='out_account' ").getResultList(false);
-		if( accountBoList==null ) {
+		if( accountBoList==null ||accountBoList.size()==0) {
 			map.put("code", "1") ;
 			map.put("msg", "本方账户不存在,请检查") ;
 			JSONObject jsonObj = JSONObject.fromObject(map);
diff --git a/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java b/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java
index 171d858dc..c21755b42 100644
--- a/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java
+++ b/src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java
@@ -21,6 +21,7 @@ import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.are.util.StringFunction;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.reckon.util.UUIDUtil;
 
@@ -414,7 +415,10 @@ public class ProductManager{
 		otherProperty.put("TYPENO", id);
 		otherProperty.put("TYPENAME", productName);
 		otherProperty.put("SORTNO", shortNo);
+	 	String time= StringFunction.getTodayNow();
+	 	otherProperty.put("INPUTTIME", time);
 		DataOperatorUtil.copySingleJBO(BUSINESS_TYPE.CLASS_NAME, fromCondition, BUSINESS_TYPE.CLASS_NAME, new HashMap<String,String>(), otherProperty, tx);
+		
 		fromCondition.clear();
 		otherProperty.clear();
 		fromCondition.put("PRD_ID", productID);