diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverList.jsp index 14f759622..9f9f245d1 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverList.jsp @@ -13,15 +13,17 @@ // doTemp.setVisible("ALLSTATUS", false); // doTemp.setVisible("ALLHANDOVERSTATUS", false); } - if(!"8006011".equals(orgid)){ - doTemp.appendJboWhere(" and O.PROJECT_MANAGE=:orgid "); + if("8006011".equals(orgid)){ + doTemp.appendJboWhere(" and O.PROJECT_DEPT=:orgid "); + }else{ + doTemp.appendJboWhere(" and O.PROJECT_MANAGE=:orgid "); } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.MultiSelect = true; //多选 dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); - dwTemp.genHTMLObjectWindow(!"8006011".equals(orgid)?ASuser.getUserID():""); + dwTemp.genHTMLObjectWindow("8006011".equals(orgid)?ASuser.getOrgID():ASuser.getUserID()); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { diff --git a/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp b/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp index 120a56ee8..0190fbbc9 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp @@ -63,16 +63,15 @@ }else{ doTemp = new ASObjectModel("FlowPayMailDocHisList"); } - if("0010".equals(CurPage.getParameter("PhaseNo"))){ + if("0010".equals(CurPage.getParameter("PhaseNo"))&&!"his".equals(type)){ doTemp.setVisible("HANDOVERSTATUS", false); } if("0020".equals(CurPage.getParameter("PhaseNo"))){ doTemp.setVisible("operation", false); } if("his".equals(type)){ - doTemp.setVisible("HANDOVERSTATUS", false); doTemp.setVisible("operation", false); - doTemp.appendJboWhere("and rela.proj_id=:contractid and rela.OBJECTTYPE in('BContractApproveFlow','FundPaymentCarFlow','MortgageFileFlow')"); + doTemp.appendJboWhere("and rela.proj_id=:contractid and rela.OBJECTTYPE in('BusinessApplyFlow','FundPaymentCarFlow','MortgageFileFlow')"); }else{ doTemp.appendJboWhere("and rela.contract_id=:contractid and rela.OBJECTTYPE ='MortgageFileMailFlow'"); doTemp.appendJboWhere(" and O.doc_Class_Itemno in ("+s+") and lmdt.flowunid ='"+flowunid+"'"); @@ -98,7 +97,7 @@ String sButtons[][] =null; sButtons=new String[][]{ - {"0010".equals(CurPage.getParameter("PhaseNo"))?"true":"false","","Button","保存","保存所有修改","0010".equals(CurPage.getParameter("PhaseNo"))?"saveRecord()":"saveRecordForApprove()","","","",""}, + {"0010".equals(CurPage.getParameter("PhaseNo"))&&!"his".equals(type)?"true":"false","","Button","保存","保存所有修改","0010".equals(CurPage.getParameter("PhaseNo"))?"saveRecord()":"saveRecordForApprove()","","","",""}, }; %> @@ -172,7 +171,7 @@ function saveRecord(){ var str=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DocMailAction","asSaveMailStatus",param); } location.reload(); - AsDebug.showMessage('提示','保存成功！','','',true); + alert('保存成功！'); } function saveRecordForApprove(){ //true:全部归档 false:部分归档 error：未归档 @@ -195,7 +194,7 @@ function saveRecordForApprove(){ var str=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DocMailAction","asSaveHandOverStatus",param); } location.reload(); - AsDebug.showMessage('提示','保存成功！','','',true); + alert('保存成功！'); } //在加载完表格后调用 function afterSearch(){ diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java index 9ad14278c..f71b82abd 100644 --- a/src_core/com/tenwa/doc/action/DocListInitAction.java +++ b/src_core/com/tenwa/doc/action/DocListInitAction.java @@ -605,7 +605,7 @@ public class DocListInitAction { } public static List nextImageForMailHisDoc(String contract_id) throws Exception{ List list = new ArrayList(); - String sql = "select lda.id attrid from lb_docrelative ldr left join lb_doclibrary ldl on ldl.RELATIVE_ID = ldr.id left join lb_docattribute lda on lda.LIBRARY_ID = ldl.ID where ldr.OBJECTTYPE IN ('BContractApproveFlow','FundPaymentCarFlow','MortgageFileFlow') and proj_id = '"+contract_id+"' and lda.id is not null"; + String sql = "select lda.id attrid from lb_docrelative ldr left join lb_doclibrary ldl on ldl.RELATIVE_ID = ldr.id left join lb_docattribute lda on lda.LIBRARY_ID = ldl.ID where ldr.OBJECTTYPE IN ('BusinessApplyFlow','FundPaymentCarFlow','MortgageFileFlow') and proj_id = '"+contract_id+"' and lda.id is not null"; List> ds = DataOperatorUtil.getDataBySql(JBOFactory.createJBOTransaction(), sql, null); for(Map map:ds){ list.add(map.get("attrid")); 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 f7ab28f26..1b4a9dff5 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/CreateFiveGradeDataAction.java @@ -99,9 +99,9 @@ public class CreateFiveGradeDataAction { oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_PRINCIPAL,TOTAL_OVERDUE_PRINCIPAL); oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_INTEREST,TOTAL_OVERDUE_INTEREST); oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_PENALTY, TOTAL_PENALTY); - oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_ALL, TOTAL_OVERDUE_PRINCIPAL+TOTAL_OVERDUE_INTEREST+TOTAL_PENALTY); + oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_ALL, new BigDecimal(TOTAL_OVERDUE_PRINCIPAL+TOTAL_OVERDUE_INTEREST+TOTAL_PENALTY).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); oldBo.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)); - oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OUTSTANDING_PRINCIPAL, TOTAL_OUTSTANDING_PRINCIPAL+""); + oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OUTSTANDING_PRINCIPAL, new BigDecimal(TOTAL_OUTSTANDING_PRINCIPAL).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.OVERDUERATE, (double) Math.round(TOTAL_OUTSTANDINGCUSTOMER_PRINCIPAL/TOTAL_OUTSTANDING_PRINCIPAL)); oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.BADNESSRATE, (double) Math.round(NOTBACK_PRINCIPAL_LOSS+NOTBACK_PRINCIPAL_SUSPICIOUS+NOTBACK_PRINCIPAL_SECONDARY/TOTAL_OUTSTANDING_PRINCIPAL)); @@ -111,11 +111,11 @@ public class CreateFiveGradeDataAction { oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.EXISTING_CUSTOMERS_NUM_SUSPICIOUS, EXISTING_CUSTOMERS_NUM_SUSPICIOUS); oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.EXISTING_CUSTOMERS_NUM_LOSS, EXISTING_CUSTOMERS_NUM_LOSS); - oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_NORMAL, NOTBACK_PRINCIPAL_NORMAL+""); - oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_ATTENTION, NOTBACK_PRINCIPAL_ATTENTION); - oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SECONDARY, NOTBACK_PRINCIPAL_SECONDARY); - oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SUSPICIOUS, NOTBACK_PRINCIPAL_SUSPICIOUS); - oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_LOSS, NOTBACK_PRINCIPAL_LOSS); + oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_NORMAL, new BigDecimal(NOTBACK_PRINCIPAL_NORMAL).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_ATTENTION, new BigDecimal(NOTBACK_PRINCIPAL_ATTENTION).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SECONDARY, new BigDecimal(NOTBACK_PRINCIPAL_SECONDARY).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SUSPICIOUS, new BigDecimal(NOTBACK_PRINCIPAL_SUSPICIOUS).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_LOSS, new BigDecimal(NOTBACK_PRINCIPAL_LOSS).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.FINANCING_AMOUNT_NORMAL, FINANCING_AMOUNT_NORMAL); oldBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.FINANCING_AMOUNT_ATTENTION, FINANCING_AMOUNT_ATTENTION); @@ -137,9 +137,9 @@ public class CreateFiveGradeDataAction { newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_PRINCIPAL,TOTAL_OVERDUE_PRINCIPAL); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_INTEREST,TOTAL_OVERDUE_INTEREST); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_PENALTY, TOTAL_PENALTY); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_ALL, TOTAL_OVERDUE_PRINCIPAL+TOTAL_OVERDUE_INTEREST+TOTAL_PENALTY); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OVERDUE_ALL, new BigDecimal(TOTAL_OVERDUE_PRINCIPAL+TOTAL_OVERDUE_INTEREST+TOTAL_PENALTY).setScale(2, BigDecimal.ROUND_DOWN).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, TOTAL_OUTSTANDING_PRINCIPAL+""); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.TOTAL_OUTSTANDING_PRINCIPAL, new BigDecimal(TOTAL_OUTSTANDING_PRINCIPAL).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.OVERDUERATE, (double) Math.round(TOTAL_OUTSTANDINGCUSTOMER_PRINCIPAL/TOTAL_OUTSTANDING_PRINCIPAL)); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.BADNESSRATE, (double) Math.round(NOTBACK_PRINCIPAL_LOSS+NOTBACK_PRINCIPAL_SUSPICIOUS+NOTBACK_PRINCIPAL_SECONDARY/TOTAL_OUTSTANDING_PRINCIPAL)); @@ -149,11 +149,11 @@ public class CreateFiveGradeDataAction { newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.EXISTING_CUSTOMERS_NUM_SUSPICIOUS, EXISTING_CUSTOMERS_NUM_SUSPICIOUS); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.EXISTING_CUSTOMERS_NUM_LOSS, EXISTING_CUSTOMERS_NUM_LOSS); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_NORMAL, NOTBACK_PRINCIPAL_NORMAL+""); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_ATTENTION, NOTBACK_PRINCIPAL_ATTENTION); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SECONDARY, NOTBACK_PRINCIPAL_SECONDARY); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SUSPICIOUS, NOTBACK_PRINCIPAL_SUSPICIOUS); - newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_LOSS, NOTBACK_PRINCIPAL_LOSS); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_NORMAL, new BigDecimal(NOTBACK_PRINCIPAL_NORMAL).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_ATTENTION, new BigDecimal(NOTBACK_PRINCIPAL_ATTENTION).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SECONDARY, new BigDecimal(NOTBACK_PRINCIPAL_SECONDARY).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_SUSPICIOUS, new BigDecimal(NOTBACK_PRINCIPAL_SUSPICIOUS).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); + newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.NOTBACK_PRINCIPAL_LOSS, new BigDecimal(NOTBACK_PRINCIPAL_LOSS).setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.FINANCING_AMOUNT_NORMAL, FINANCING_AMOUNT_NORMAL); newBo.setAttributeValue(LB_FIVEGRADEDETAILED_INFO.FINANCING_AMOUNT_ATTENTION, FINANCING_AMOUNT_ATTENTION);