From b72de7654beac7f96362ef0def0184bcca1e05fe Mon Sep 17 00:00:00 2001
From: zzk <skr2acaba@163.com>
Date: Fri, 15 Sep 2023 15:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=84=8F=E8=A7=81=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/Project/BusinessApplication/ApprovalForm.jsp | 10 +++++++++-
 .../project/businessapply/BusinessApproveManager.java | 11 ++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index 40be92e57..e2c16e242 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -705,6 +705,7 @@
 		}else {
 			hideItem(0,"VETO");
 			setItemRequired(0,"VETO",false);
+			setItemValue(0, 0, "VETO", "");
 		}
 	}
 	
@@ -871,7 +872,6 @@
 		}else if("0040" == "<%=phaseNo%>"||"0050" == "<%=phaseNo%>"){
 			phaseChoice = getItemValue(0,0,"secondchoice");
 			phaseOpinion = getItemValue(0,0,"secondopinion");
-			VETO = getItemValue(0,0,"VETO");
 		}else if("0060" == "<%=phaseNo%>"){
 			phaseChoice = getItemValue(0,0,"thirdchoice");
 			phaseOpinion = getItemValue(0,0,"thirdopinion");
@@ -879,6 +879,14 @@
 			phaseChoice = getItemValue(0,0,"fourchoice");
 			phaseOpinion = getItemValue(0,0,"fouropinion");
 		}
+		//根据复审意见对拒绝理由赋值
+		var vo = getItemValue(0,0,"secondchoice");
+		if(vo=="0010"){
+			VETO = getItemValue(0,0,"VETO");
+		}else {
+			VETO = "";
+		}
+
 // 		var InterOpinion1 = getItemValue(0,0,"InterOpinion1");
 // 		var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1");
 // 		var InterOpinion2 = getItemValue(0,0,"InterOpinion2");
diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
index 208924afd..91ad3f30a 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java
@@ -220,12 +220,17 @@ public class BusinessApproveManager {
 				bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate();
 			}
 			bomFO.saveObject(bo);
-			if(veto!=null||"".equals(veto)){
+
 				Transaction sqlca = Transaction.createTransaction(tx);
-				String ssql= "update LB_PROJECT_INFO_TEMP set veto = '"+veto+"' where FLOWUNID = '"+flowunid+"'";
+			String ssql = "";
+			if(veto!=null||"".equals(veto)){
+				 ssql= "update LB_PROJECT_INFO_TEMP set veto = '"+veto+"' where FLOWUNID = '"+flowunid+"'";
+			}else {
+				 ssql= "update LB_PROJECT_INFO_TEMP set veto = '' where FLOWUNID = '"+flowunid+"'";
+			}
 				SqlObject sqlObject = new SqlObject(ssql);
 				sqlca.executeSQL(sqlObject);
-			}
+
 			tx.commit();
 		}catch(Exception e){
 			e.printStackTrace();