diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp index cc3b6adbf..b10c0830d 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBPlaceFileTempInfo.jsp @@ -53,7 +53,7 @@ dwTemp.replaceColumn("opinion", "", CurPage.getObjectWindowOutput()); String sButtons[][] = { - {"true","All","Button","保存","保存所有修改","as_save(0,'frame_list.window.saveRecordForApprove()')","","","",""}, + {"true","All","Button","保存","保存所有修改","save()","","","",""}, {"false","All","Button","返回","返回列表","returnList()","","","",""} }; // sButtonPosition = "south"; @@ -69,5 +69,15 @@ setItemValue(0, 0, "ARCHIVING_PERSON","<%=userName%>"); } }) + function save(){ + if("0020"=="<%=PhaseNo%>"){ + //frame_list.window.checkfile(); IE浏览器不起作用 + $("#frame_list")[0].contentWindow.checkfile(); + //$(window.parent.document).contents().find("#frame_list")[0].contentWindow.checkfile(); + + } + //as_save(0,'frame_list.window.saveRecordForApprove()'); IE浏览器不起作用 + as_save(0,'$("#frame_list")[0].contentWindow.saveRecordForApprove();'); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp index 59ffcc755..32d238185 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp @@ -142,9 +142,10 @@ } function deleteRecord(){ var sUrl = ""; - var selectedRow = getItemValueArray(0,'contract_id'); + /* var selectedRow = getItemValueArray(0,'contract_id'); selectedRow = selectedRow+""; - selectedRow = selectedRow.replace(/,/g,'@'); + selectedRow = selectedRow.replace(/,/g,'@'); */ + var selectedRow = getItemValue(0, getRow(0), "contract_id"); var sParams = "contractid="+selectedRow+",flowunid=<%=CurPage.getParameter("ObjectNo")%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DocMailAction","deleteReadyMailList",sParams); if("success"==sReturnInfo){ diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java index 0527e6081..37ae9a0e0 100644 --- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java +++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java @@ -88,6 +88,7 @@ public class CreateTransactionExecutor implements Transaction { private String orgID; private String flow_name; private String ebanknumber; + private String projectId; public String getStartDate() { return startDate; @@ -1124,7 +1125,23 @@ public class CreateTransactionExecutor implements Transaction { tx.commit(); return "Success"; } - + + //校验融资金额是否超额 + public String checkMoney()throws Exception{ + double sumMoney = 0.0; + BizObjectManager lcctManage = JBOFactory.getBizObjectManager(LC_CALC_CONDITION_TEMP.CLASS_NAME); + List lccts = lcctManage.createQuery(" project_id=:projectid and flowunid<>:flowunid and contract_plan_number<>'' ").setParameter("projectid", projectId).setParameter("flowunid", flowunid).getResultList(false); + for (BizObject lcct : lccts) { + lcct.getAttribute("EQUIP_AMT").getString(); + double equip_money = new Double(lcct.getAttribute("EQUIP_AMT").getString()); + sumMoney = sumMoney+equip_money; + } + BizObject lcctm = lcctManage.createQuery(" project_id=:projectid AND contract_plan_number = '' ").setParameter("projectid", projectId).getSingleResult(false); + double equip_money = new Double(lcctm.getAttribute("EQUIP_AMT").getString()); + return (equip_money-sumMoney)+""; + } + + public String getCalType() { return calType; } @@ -1242,6 +1259,14 @@ public class CreateTransactionExecutor implements Transaction { this.ebanknumber = ebanknumber; } + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java index 65d255ed8..1ff1ab761 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java @@ -111,7 +111,10 @@ public class CreateFiveGradeDataAction { newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_ALL, new BigDecimal(TOTAL_OVERDUE_PRINCIPAL).setScale(2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(TOTAL_OVERDUE_INTEREST).setScale(2, BigDecimal.ROUND_HALF_UP)).add(new BigDecimal(TOTAL_PENALTY).setScale(2, BigDecimal.ROUND_HALF_UP)).toPlainString()); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.EXISTING_CUSTOMERS_NUM, Integer.parseInt(EXISTING_CUSTOMERS_NUM_NORMAL)+Integer.parseInt(EXISTING_CUSTOMERS_NUM_ATTENTION)+Integer.parseInt(EXISTING_CUSTOMERS_NUM_SUSPICIOUS)+Integer.parseInt(EXISTING_CUSTOMERS_NUM_LOSS)+Integer.parseInt(EXISTING_CUSTOMERS_NUM_SECONDARY)); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OUTSTANDING_PRINCIPAL, new BigDecimal(TOTAL_OUTSTANDING_PRINCIPAL).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.OVERDUERATE, new BigDecimal(ALL_TOTAL_OUTSTANDING_PRINCIPAL==0.0?0.0:TOTAL_OUTSTANDINGCUSTOMER_PRINCIPAL/ALL_TOTAL_OUTSTANDING_PRINCIPAL).multiply(yibai).setScale(4, BigDecimal.ROUND_HALF_UP).toPlainString()+"%"); +// newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.OVERDUERATE, new BigDecimal(ALL_TOTAL_OUTSTANDING_PRINCIPAL==0.0?0.0:TOTAL_OUTSTANDINGCUSTOMER_PRINCIPAL/ALL_TOTAL_OUTSTANDING_PRINCIPAL).multiply(yibai).setScale(4, BigDecimal.ROUND_HALF_UP).toPlainString()+"%"); + + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.OVERDUERATE, new BigDecimal(TOTAL_OUTSTANDING_PRINCIPAL==0.0?0.0:TOTAL_OUTSTANDINGCUSTOMER_PRINCIPAL/TOTAL_OUTSTANDING_PRINCIPAL).multiply(yibai).setScale(4, BigDecimal.ROUND_HALF_UP).toPlainString()+"%"); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.BADNESSRATE, new BigDecimal(ALL_TOTAL_OUTSTANDING_PRINCIPAL==0.0?0.0:(NOTBACK_PRINCIPAL_LOSS+NOTBACK_PRINCIPAL_SUSPICIOUS+NOTBACK_PRINCIPAL_SECONDARY)/ALL_TOTAL_OUTSTANDING_PRINCIPAL).multiply(yibai).setScale(4, BigDecimal.ROUND_HALF_UP).toPlainString()+"%"); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.EXISTING_CUSTOMERS_NUM_NORMAL, EXISTING_CUSTOMERS_NUM_NORMAL); @@ -220,17 +223,33 @@ public class CreateFiveGradeDataAction { private double calcOverDueCustomerAllCorpus(String distributorNo,Transaction tx) throws Exception{ double sumsurpcorpus = 0.00; - String sql = " select sum(lcc.CLEAN_LEASE_MONEY-t1.sumincomecorpus) sumsurpcorpus from " + /* String sql = " select sum(lcc.CLEAN_LEASE_MONEY-t1.sumincomecorpus) sumsurpcorpus from " + " (SELECT sum(ifnull(lri.CORPUS+lri.CORPUS_ADJUST,0)) sumincomecorpus,lci.ID " + " FROM lc_rent_plan lrp " + " LEFT JOIN (select sum(corpus) corpus,sum(corpus_adjust) corpus_adjust,CONTRACT_ID,PLAN_LIST from lc_rent_income group by CONTRACT_ID,PLAN_LIST ) lri ON lrp.PLAN_LIST = lri.PLAN_LIST and lri.CONTRACT_ID = lrp.CONTRACT_ID " + " left join lb_contract_info lci on lci.ID = lrp.CONTRACT_ID " - + " where lrp.PLAN_DATE<'"+StringFunction.getTodayNow().substring(0, 10)+"' and (lrp.CORPUS - ifnull(lri.CORPUS,0) - ifnull(lri.CORPUS_ADJUST,0))>=0 " + + " where lrp.PLAN_DATE<'"+StringFunction.getTodayNow().substring(0, 10)+"' and (lrp.CORPUS - ifnull(lri.CORPUS,0) - ifnull(lri.CORPUS_ADJUST,0))>0 " + " group by lci.ID) t1 " + " left join lc_calc_condition lcc on lcc.CONTRACT_ID = t1.ID " + " left join lb_contract_info lciv on lciv.id = t1.ID " + " where lciv.distributor_id = '"+distributorNo+"' " - + " group by lciv.distributor_id "; + + " group by lciv.distributor_id ";*/ + String sql ="SELECT SUM(IFNULL(lrp.corpus,0)) - SUM(IFNULL(vlci.corpus,0)) - SUM(IFNULL(vlci.CORPUS_ADJUST,0)) sumsurpcorpus" + + " FROM lb_contract_info vlci LEFT JOIN lc_rent_plan lrp ON vlci.id = lrp.contract_id " + + " LEFT JOIN (SELECT SUM(corpus) corpus,SUM(corpus_adjust) corpus_adjust,CONTRACT_ID,PLAN_LIST " + + " FROM lc_rent_income " + + " GROUP BY CONTRACT_ID,PLAN_LIST) vlci ON lrp.PLAN_LIST = vlci.PLAN_LIST AND vlci.CONTRACT_ID = lrp.CONTRACT_ID " + + " WHERE vlci.id IN (SELECT lci.id " + + " FROM lc_rent_plan lrp " + + " LEFT JOIN (SELECT SUM(corpus) corpus,SUM(corpus_adjust) corpus_adjust,CONTRACT_ID,PLAN_LIST " + + " FROM lc_rent_income " + + " GROUP BY CONTRACT_ID, PLAN_LIST) lri ON lrp.PLAN_LIST = lri.PLAN_LIST AND lri.CONTRACT_ID = lrp.CONTRACT_ID " + + " LEFT JOIN lb_contract_info lci ON lci.ID = lrp.CONTRACT_ID " + + " WHERE lrp.PLAN_DATE < '"+StringFunction.getTodayNow().substring(0, 10)+"' " + + " AND (lrp.CORPUS - IFNULL(lri.CORPUS, 0) - IFNULL(lri.CORPUS_ADJUST, 0)) > 0 " + + " AND lci.distributor_id ='"+distributorNo+"' " + + " GROUP BY lci.ID) " + + " GROUP BY vlci.distributor_id"; SqlObject sqlobj = new SqlObject(sql); ASResultSet rs = tx.getASResultSet(sqlobj); if(rs.next()){