diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index a2dcb0fe2..6be6f784f 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -313,8 +313,14 @@ phaseChoice = getItemValue(0,0,"fourchoice"); phaseOpinion = getItemValue(0,0,"fouropinion"); } + var InterOpinion1 = getItemValue(0,0,"InterOpinion1"); + var DistriOpinion1 = getItemValue(0,0,"DistriOpinion1"); + var InterOpinion2 = getItemValue(0,0,"InterOpinion2"); + var DistriOpinion2 = getItemValue(0,0,"DistriOpinion2"); + var InterOpinion3 = getItemValue(0,0,"InterOpinion3"); + var DistriOpinion3 = getItemValue(0,0,"DistriOpinion3"); var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveApproveOpinion", - "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>"); + "serialNo=<%=taskno%>,phaseNo=<%=phaseNo%>,flowunid=<%=flowunid%>,phaseChoice="+phaseChoice+",phaseOpinion="+phaseOpinion+",InterOpinion1="+InterOpinion1+",DistriOpinion1="+DistriOpinion1+",InterOpinion2="+InterOpinion2+",DistriOpinion2="+DistriOpinion2+",InterOpinion3="+InterOpinion3+",DistriOpinion3="+DistriOpinion3+",userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>"); if("SUCCESS" == sResult){ resetDWDialog("±£´æ³É¹¦£¡",true); reloadSelf(); 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 58aa004c2..4d342ea7d 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/BusinessApproveManager.java @@ -21,7 +21,69 @@ public class BusinessApproveManager { private String userid; private String orgid; private String plate_number; + private String InterOpinion1; + private String DistriOpinion1; + private String InterOpinion2; + private String DistriOpinion2; + private String InterOpinion3; + private String DistriOpinion3; + public String getDistriOpinion1() { + return DistriOpinion1; + } + + public void setDistriOpinion1(String distriOpinion1) { + DistriOpinion1 = distriOpinion1; + } + + public String getInterOpinion2() { + return InterOpinion2; + } + + public void setInterOpinion2(String interOpinion2) { + InterOpinion2 = interOpinion2; + } + + public String getDistriOpinion2() { + return DistriOpinion2; + } + + public void setDistriOpinion2(String distriOpinion2) { + DistriOpinion2 = distriOpinion2; + } + + public String getInterOpinion3() { + return InterOpinion3; + } + + public void setInterOpinion3(String interOpinion3) { + InterOpinion3 = interOpinion3; + } + + public String getDistriOpinion3() { + return DistriOpinion3; + } + + public void setDistriOpinion3(String distriOpinion3) { + DistriOpinion3 = distriOpinion3; + } + + public String getPhaseNo() { + return phaseNo; + } + + public void setPhaseNo(String phaseNo) { + this.phaseNo = phaseNo; + } + + public String getInterOpinion1() { + return InterOpinion1; + } + + public void setInterOpinion1(String interOpinion1) { + InterOpinion1 = interOpinion1; + } + public String getPlate_number() { return plate_number; } @@ -92,15 +154,27 @@ public class BusinessApproveManager { bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate(); bo.setAttributeValue("phaseopinion", phaseOpinion); bo.setAttributeValue("phasechoice", phaseChoice); + bo.setAttributeValue("InterOpinion1", InterOpinion1); + bo.setAttributeValue("DistriOpinion1", DistriOpinion1); + bo.setAttributeValue("InterOpinion2", InterOpinion2); + bo.setAttributeValue("DistriOpinion2", DistriOpinion2); + bo.setAttributeValue("InterOpinion3", InterOpinion3); + bo.setAttributeValue("DistriOpinion3", DistriOpinion3); }else{ bo = bomFO.newObject(); bo.setAttributeValue("serialno", serialNo); bo.setAttributeValue("opinionno", UUIDUtil.getUUID()); bo.setAttributeValue("phaseopinion", phaseOpinion); bo.setAttributeValue("phasechoice", phaseChoice); + bo.setAttributeValue("InterOpinion1", InterOpinion1); + bo.setAttributeValue("DistriOpinion1", DistriOpinion1); + bo.setAttributeValue("InterOpinion2", InterOpinion2); + bo.setAttributeValue("DistriOpinion2", DistriOpinion2); + bo.setAttributeValue("InterOpinion3", InterOpinion3); + bo.setAttributeValue("DistriOpinion3", DistriOpinion3); bo.setAttributeValue("inputuser", userid); bo.setAttributeValue("inputorg", orgid); - bo.setAttributeValue("inputtime", StringFunction.getToday()); + bo.setAttributeValue("inputtime", StringFunction.getTodayNow()); bomFT.createQuery("update O set relativeobjectno='"+serialNo+"' where serialno='"+serialNo+"'").executeUpdate(); } bomFO.saveObject(bo);