From 5459a116cb1c4154b43a94a4bb6c307b6e37ffcb Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Tue, 26 Jun 2018 21:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=B5=E5=AD=90=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lease/Flow/Comm/LBContract/LBContractPrintList.jsp   | 9 +++++++--
 .../LBContractPersonBaseInfo.jsp                         | 2 +-
 .../Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp | 4 ++++
 .../app/baseFileTemplate/handle/FileTemplateUtil.java    | 3 ++-
 .../tenwa/channelportal/action/ContractSignAction.java   | 8 ++++----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
index e61ec1566..1ca27f364 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp
@@ -6,6 +6,7 @@
         History Log: 
     */
     String custtype = CurPage.getParameter("CustomerType");
+    String PhaseNo = CurPage.getParameter("PhaseNo");
 	String projectId = CurPage.getParameter("ProjectId");
 // 	String signStatus = CurPage.getParameter("SignStatus");
 	String contractNumber = CurPage.getParameter("ContractNumber");
@@ -21,6 +22,7 @@
 	dwTemp.genHTMLObjectWindow(id+","+flowunid);
 	String btnflag = "true";
 	String btnflagcom = "false";
+	String signs = "false";
 	if("01".equals(custtype)){
 		btnflagcom = "true";
 	}
@@ -28,13 +30,16 @@
 		btnflag = "false";
 		btnflagcom = "false";
 	}
+	//判断是不是流程的第二步
+	if("0020".equals(PhaseNo)){
+		signs = "true";
+	}
 	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
 	String sButtons[][] = {
 		{btnflag,"","Button","发起电子签约","电子签章合同","signOnLine()","","","","btn_icon_sign",""},
 		{btnflag,"","Button","查询签约结果","查询签约结果","getStatus()","","","","btn_icon_obtain",""},
 		{btnflag,"","Button","重新发送短信","重新发送短信","sendMessageAgain()","","","","btn_icon_refresh",""},
-		{btnflag,"","Button","公司盖章","公司盖章","sign()","","","","btn_icon_refresh",""},
-		{btnflagcom,"","Button","下载纸质合同","下载纸质合同","downFile()","","","","btn_icon_down",""},
+		{signs,"","Button","公司盖章","公司盖章","sign()","","","","btn_icon_refresh",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <style>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp
index 0876ca96b..9004039d0 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp
@@ -53,7 +53,7 @@
 	/* 左侧样式微调 */
 	$("#div_1580").find("[style='display:inline-block;width:6px;']").css("width","100");
 	$("#div_920").find("[style='display:inline-block;width:6px;']").css("width","100");
-	$("#div_1410").find("[style='display:inline-block;width:6px;']").css("width","100");
+	$("#div_1410").find("[style='display:inline-block;width:6px;']").css("width","88");
 	$("#div_1390").find("[style='display:inline-block;width:6px;']").css("width","100");
 	/* 右侧 样式微调*/
 	$("#A_div_900").find("[style='display:inline-block;width:6px;']").css("width","86");
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp
index 6f5a70b10..d70cec244 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitList.jsp
@@ -48,6 +48,10 @@
 	}
 	function viewAndEdit(){
 		var ID = getItemValue(0,getRow(0),'ID');
+		if("undefined"==ID||""==ID || null==ID){
+			AsDebug.showMessage("提示","请选中一条数据！","","",true);
+			return;
+		}
 		var sUrl = "Tenwa/Lease/Flow/Comm/LBGuaranteeUnit/LBGuaranteePerUnitInfo.jsp";
 		var sparam = 'ID='+ID;
 		AsControl.OpenView(sUrl,sparam,"_self","");
diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
index 5c38c90db..8b18dd39d 100644
--- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
+++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java
@@ -83,7 +83,8 @@ public class FileTemplateUtil {
 		while (rs.next()){
 			tempFiles.add("{'text':'"+rs.getString("templatename")+"','value':'"+rs.getString("id")+"'}");
 		}
-		String sReturn="[{'fileTemplate':\""+tempFiles.toString()+"\"}]";
+//		String sReturn="[{'fileTemplate':\""+tempFiles.toString()+"\"}]";
+		String sReturn="[{'fileTemplate':\""+"[{'text':'融资租赁合同-C端直租','value':'24aba365e2794a018814ae81341486bf'}]"+"\"}]";
     	return sReturn;
     }
 	
diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java
index 3d268a00e..4a0683d10 100644
--- a/src/com/tenwa/channelportal/action/ContractSignAction.java
+++ b/src/com/tenwa/channelportal/action/ContractSignAction.java
@@ -869,7 +869,7 @@ public class ContractSignAction{
         pbo.setAttributeValue("project_status", "4");// 状态改成已完成电子签约
         pbm.saveObject(pbo);
         // 记录项目进程日志
-        Transaction tran = Transaction.createTransaction(tx);
+       /* Transaction tran = Transaction.createTransaction(tx);
         ASUser user = ASUser.getUser(CurUserID, tran);
         JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME, tx)
                 .createQuery("UPDATE O SET BUSINESS_STATUS='4',UPDATEUSERID='" + user.getUserID() + "',UPDATEORGID='"
@@ -884,10 +884,10 @@ public class ContractSignAction{
         so.setDebugSql(so.getDebugSql().replaceAll("△", ":"));
         so.setOriginalSql(so.getOriginalSql().replaceAll("△", ":"));
         so.setRunSql(so.getRunSql().replaceAll("△", ":"));
-        tran.executeSQL(so);
+        tran.executeSQL(so);*/
         for (BizObject keys : bo) {
-          ldBom.createQuery("update O set status='' where id='" + keys.getAttribute("attribute_id").toString() + "'")
-               .executeUpdate();
+         /* ldBom.createQuery("update O set status='' where id='" + keys.getAttribute("attribute_id").toString() + "'")
+               .executeUpdate();*/
         }
           status = ";<br>已经完成电子签约";
       }