diff --git a/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp b/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp index 64966e860..3c9a4bda1 100644 --- a/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp +++ b/WebContent/Tenwa/Core/ChannelCRMManager/ChannelOrg/OrgTree.jsp @@ -50,7 +50,7 @@ overflow: hidden; } -
+
<% String compClientID = request.getParameter("CompClientID"); @@ -68,7 +68,7 @@ jQuery(function(){ loadMask = new tracywindyLoadMask(document.body,"数据加载中 请稍后..."); } var height=$("body").height(); - $("#id_menu_tabs_menu").height((height-30) <= 0 ? "100%" : height-30); + $("#id_menu_tabs_menu").height(height-30 <=0 ? "100%": height-30); initDeptTree(sOrgId,""); }); diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf index ee42abf22..c6d0c08f0 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunctionForTab.jspf @@ -114,7 +114,7 @@ function backStep(){ if("BusinessApplyFlow"==param["FlowNo"]){ if("0030,0040,0050".indexOf(param["PhaseNo"])>-1){ var sReturn = AsControl.RunJavaMethodTrans("com.tenwa.controller.LAElementConfigController","queryBusinessApproval","PhaseNo="+param["PhaseNo"]+",ObjectNo="+param["ObjectNo"]);//返回值: yes-有意见; no-无意见; error-查询出错 - if("0020"==sReturn){ + if("0070"==sReturn){ if (!confirm('已选择同意是否确实要退回')) return false; } } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index 8cbb13819..f3c9c2eed 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -8,9 +8,9 @@ */ String flowunid = CurPage.getParameter("FlowUnid"); -String RightType = CurPage.getParameter("RightType");//选择模式 -String ishistory=CurPage.getParameter("IsHistory"); -String nodeNo=CurPage.getParameter("NodeNo"); + String RightType = CurPage.getParameter("RightType");//选择模式 + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); BizObject condition=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); String paymentnumber=condition.getAttribute("payment_number").getString(); @@ -78,6 +78,9 @@ String nodeNo=CurPage.getParameter("NodeNo"); setItemValue(0,getRow(),"REPURCHASE_RATIO","100"); //回购本金 setItemValue(0,getRow(),"REPURCHASE_MONEY",remaincorpus); + + setItemValue(0,getRow(),"FIST_RENT",terminateInfo.fist_rent); + } } @@ -128,6 +131,7 @@ String nodeNo=CurPage.getParameter("NodeNo"); jQuery(function(){ setItemValue(0,0,"flowunid","<%=flowunid%>"); + setItemValue(0,0,"PAYDAY_DATE","<%=StringFunction.getToday()%>"); //设置商定罚息带出逾期罚息 setItemValue(0,0,"AGREED_PENALTY",getItemValue(0,0,'DUN_PENALTY')); //判断其他应收和其他应退是否为空 diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 8ed56050a..490aeaf5e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -273,12 +273,12 @@ var secondchoice = getItemValue(0,0,"secondchoice"); if(secondchoice==""){ setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",false); + //setItemRequired(0,"DistriOpinion2",false); $("#SECONDOPINION").removeAttr("disabled"); } if(secondchoice=="0020"){ setItemRequired(0,"InterOpinion2",true); - setItemRequired(0,"DistriOpinion2",false); + //setItemRequired(0,"DistriOpinion2",false); $("#SECONDOPINION").removeAttr("disabled"); var obj=document.getElementById('SECONDOPINION'); for(var i=0;i<7;i++){ @@ -289,7 +289,7 @@ if(secondchoice=="0010"){ setItemRequired(0,"A_div_1240",true); setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",true); + //setItemRequired(0,"DistriOpinion2",true); $("#SECONDOPINION").removeAttr("disabled"); var obj=document.getElementById('SECONDOPINION'); for(var i=0;i<7;i++){ @@ -299,14 +299,14 @@ } if(secondchoice=="0030"){ setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",true); + //setItemRequired(0,"DistriOpinion2",true); setItemRequired(0,"secondopinion",false); setItemValue(0,0,"secondopinion",""); $("#SECONDOPINION").attr("disabled","disabled"); } if(secondchoice=="0040"){ setItemRequired(0,"InterOpinion2",false); - setItemRequired(0,"DistriOpinion2",true); + //setItemRequired(0,"DistriOpinion2",true); setItemValue(0,0,"secondopinion",""); $("#SECONDOPINION").attr("disabled","disabled"); } @@ -317,13 +317,13 @@ var thirdchoice = getItemValue(0,0,"thirdchoice"); if(thirdchoice==""){ setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",false); + //setItemRequired(0,"DistriOpinion3",false); $("#THIRDOPINION").removeAttr("disabled"); } if(thirdchoice=="0010"){ setItemRequired(0,"A_div_1260",true); setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",true); + //setItemRequired(0,"DistriOpinion3",true); $("#THIRDOPINION").removeAttr("disabled"); var obj=document.getElementById('THIRDOPINION'); for(var i=0;i<7;i++){ @@ -333,7 +333,7 @@ } if(thirdchoice=="0020"){ setItemRequired(0,"InterOpinion3",true); - setItemRequired(0,"DistriOpinion3",false); + //setItemRequired(0,"DistriOpinion3",false); $("#THIRDOPINION").removeAttr("disabled"); var obj=document.getElementById('THIRDOPINION'); for(var i=0;i<7;i++){ @@ -343,14 +343,14 @@ } if(thirdchoice=="0030"){ setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",true); + //setItemRequired(0,"DistriOpinion3",true); setItemRequired(0,"thirdopinion",false); setItemValue(0,0,"thirdopinion",""); $("#THIRDOPINION").attr("disabled","disabled"); } if(thirdchoice=="0040"){ setItemRequired(0,"InterOpinion3",false); - setItemRequired(0,"DistriOpinion3",true); + //setItemRequired(0,"DistriOpinion3",true); setItemValue(0,0,"thirdopinion",""); $("#THIRDOPINION").attr("disabled","disabled"); } diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 5e2937f14..bb3ad0f50 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -305,6 +305,13 @@ + + + + + + + @@ -345,6 +352,12 @@ + + + + + + diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java index 2d2239c96..185c10d14 100644 --- a/calc/com/tenwa/reckon/executor/RentCalHelper.java +++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java @@ -141,16 +141,16 @@ public class RentCalHelper { + " sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.remaininterest else 0 end ) remaininterest, " +" sum(case when DATE_FORMAT(t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.corpus else 0 end ) remainfincorpus," +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') > DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.interest else 0 end ) remainfininterest," - +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') <= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.overduerent else 0 end ) overduerent " + +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') <= DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.overduerent else 0 end ) overduerent,min(t.rent*(12-t.cou)) fist_rent " + " from (" + " select " + " t1.corpus-ifnull(t2.sumincomecorpus,0) remaincorpus," + " t1.interestbusiness - ifnull(t2.sumincomeinterest,0) remaininterest," - + " t1.rent - ifnull(t2.sumincomerent,0) overduerent," + + " t1.rent - ifnull(t2.sumincomerent,0) overduerent, t1.rent," + " t1.corpus," + " t1.interest," + " t1.plandate," - + " t1.planlist" + + " t1.planlist,IFNULL(t2.cou,0) cou" + " from (" + " select cfrp.plan_date plandate," + " cfrp.plan_list planlist," @@ -168,7 +168,7 @@ public class RentCalHelper { + " ,sum(cfri.interest ) sumincomeinterest," + " sum( cfri.rent ) sumincomerent," + " min(cfri.contract_id) contractid," - + " cfri.plan_list planlist" + + " cfri.plan_list planlist,count(1) cou" + " from LC_RENT_INCOME cfri " + " where cfri.contract_id = ? and payment_number=?" + " group by cfri.plan_list" @@ -183,6 +183,7 @@ public class RentCalHelper { for(String key : detailInfo.keySet()){ jsonObject.appendElement(key, detailInfo.get(key)); } + System.out.println(jsonObject.toString()); return JSONEncoder.encode(jsonObject); }catch(Exception e){ tx.rollback(); @@ -199,8 +200,7 @@ public class RentCalHelper { */ public String getTerminateOtherInfo() throws Exception { JSONObject jsonObject = JSONObject.createObject(); - - String fundSql = "select t2.sumplanin-ifnull(t1.sumchargein,0) fundin,t2.sumplanout- ifnull(t1.sumchargeout,0) fundout from ( " + String fundSql = "select t2.sumplanin-ifnull(t1.sumchargein,0) fundin,t2.sumplanout- ifnull(t1.sumchargeout,0) fundout,max(lc.NOMINAL_PRICE) nominalprice from ( " + " select sum(case ffc.pay_type when 'pay_type_in' then ffc.fact_money else 0 end )sumchargein, " + " sum(case ffc.pay_type when 'pay_type_out' then ffc.fact_money else 0 end )sumchargeout, " + " min(ffc.contract_id) contractid,min(ffc.payment_number) paymentnumber " @@ -211,7 +211,7 @@ public class RentCalHelper { + " min(ffp.contract_id) contractid,min(ffp.payment_number) paymentnumber " + " from LC_FUND_PLAN ffp " + " where ffp.contract_id = ? and ffp.payment_number=?" - + " )t2 on t1.contractid = t2.contractid and t1.paymentnumber=t2.paymentnumber"; + + " )t2 on t1.contractid = t2.contractid and t1.paymentnumber=t2.paymentnumber left join lc_calc_condition lc on lc.CONTRACT_ID=t2.contractid"; if("ORACLE".equals(InitDBType.DBTYPE)){ fundSql=fundSql.replaceAll("ifnull", "nvl"); } @@ -224,9 +224,11 @@ public class RentCalHelper { Map fundMap = list.get(0); jsonObject.appendElement("OTHER_IN",fundMap.get("fundin")); jsonObject.appendElement("OTHER_OUT",fundMap.get("fundout")); + jsonObject.appendElement("NOMINAL_PRICE",fundMap.get("nominalprice")); }else{ jsonObject.appendElement("OTHER_IN","0"); jsonObject.appendElement("OTHER_OUT","0"); + jsonObject.appendElement("NOMINAL_PRICE","0"); } } catch (JBOException e) { tx.rollback(); diff --git a/src_tenwa/com/tenwa/controller/LAElementConfigController.java b/src_tenwa/com/tenwa/controller/LAElementConfigController.java index 2343c8241..f0f782610 100644 --- a/src_tenwa/com/tenwa/controller/LAElementConfigController.java +++ b/src_tenwa/com/tenwa/controller/LAElementConfigController.java @@ -65,13 +65,13 @@ public class LAElementConfigController { BizObject bo = lleManager.createQuery("FLOWUNID=:FLOWUNID ").setParameter("FLOWUNID",this.getObjectNo()).getSingleResult(false); switch (this.getPhaseNo()) { case "0030": - meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.firstchoice).toString():"false"; + meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.firstopinion).toString():"false"; break; case "0040": - meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.secondchoice).toString():"false";; + meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.secondopinion).toString():"false";; break; case "0050": - meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.thirdchoice).toString():"false";; + meagess=meagess=bo!=null?bo.getAttribute(VI_BUSINESS_APPROVAL.thirdopinion).toString():"false";; break; default: meagess="false";