diff --git a/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp b/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp index 1b022102d..40d3ca078 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/PayDocMailList.jsp @@ -170,6 +170,7 @@ function saveRecord(){ var param="MailStatus="+MAILSTATUS+",libraryid="+id+",flowunid=<%=flowunid%>,AllStatus="+allstatus+",contractid=<%=contract_id%>"; var str=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DocMailAction","asSaveMailStatus",param); } + var str=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.DocMailAction","updateStatus","flowunid=<%=flowunid%>,contractid=<%=contract_id%>"); location.reload(); alert('保存成功！'); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp index 3883b1c38..64078e7c5 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceInfo.jsp @@ -2,7 +2,7 @@ <%@ page contentType="text/html; charset=GBK"%> <%@include file="/Frame/resources/include/include_begin_info.jspf"%><% - + String Id = CurPage.getParameter("ID"); String sPrevUrl = CurPage.getParameter("PrevUrl"); if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/PoundageMaintenanceList.jsp"; String sTempletNo = "LPoundageMaintenanceInfo";//--模板号-- @@ -10,8 +10,10 @@ doTemp.setHtmlEvent("charge_channel", "onchange", "getChargeWay"); doTemp.setHtmlEvent("expiry_date", "onchange", "isEndTime"); doTemp.setHtmlEvent("start_date", "onchange", "isStartTime"); - //doTemp.setReadOnly("start_date",true);//先把页面所有字段设为只读状态 - //doTemp.setReadOnly("expiry_date",true);//先把页面所有字段设为只读状态 + if(Id!=null){ + doTemp.setReadOnly("start_date",true);//先把页面所有字段设为只读状态 + doTemp.setReadOnly("expiry_date",true);//先把页面所有字段设为只读状态 + } ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "0";//只读模式 diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index 0577bca74..f9334392c 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -202,6 +202,12 @@ //保存数据 function saveRecord(sPostEvents) { + //校验是否有保证金代偿 + var isCompensation = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","isCompensation","contractId=<%=contractId%>"); + if("false" == isCompensation){ + alert("该合同有保证金代偿，无法发起提请结清！"); + return ; + } //检查是否进行过变更 var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","checkIsRentChange","flowunid=<%=flowunid%>,plannumber=<%=paymentnumber%>"); if(result == 'true'){ diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp index 791632317..d223d2691 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractTerminate/ContractTerminateApplyList.jsp @@ -18,11 +18,11 @@ var project_name = sReturn[4]; var payment_number = sReturn[5]; //校验是否有保证金代偿 - var isCompensation = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","isCompensation","contractId="+contract_id); + /* var isCompensation = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","isCompensation","contractId="+contract_id); if("false" == isCompensation){ alert("该合同有保证金代偿，无法发起提请结清！"); return ; - } + } */ var sParams = "applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; sParams =sParams+",payment_number="+payment_number+",ProjectId="+project_id+",FlowKey="+payment_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.terminate.TerminateFlowStartAction","initFLow",sParams); diff --git a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp index 46f5b293e..51083b720 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/FundCollection/FundCollectionApplyList.jsp @@ -6,16 +6,18 @@ /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newApply(){ var orgId="<%=CurUser.getOrgID()%>".substring(0,7); + var twoParam = ""; var businessType=""; if(orgId=="8009010"){ businessType="传统"; }else if(orgId=="8009011"){ businessType="汽车"; + twoParam = "汽车类传统"; }else{ alert("当前用户不能发起申请！"); return; } - AsDialog.OpenSelector("SelectEbankData","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + AsDialog.OpenSelector("SelectEbankData","businessType,"+businessType+",twoParam,"+twoParam,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"){ return; } diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java index 8362b56d0..08aa28ae2 100644 --- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java +++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java @@ -230,7 +230,7 @@ public class CreditBodyGuardAction { }else if("身份证命中法院失信名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); - @SuppressWarnings("rawtypes") + /*@SuppressWarnings("rawtypes") List courtdetailList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("court_details")),HashMap.class); StringBuffer sb = new StringBuffer(); for(int j=0;j detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + //+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name")+"。"; }else if("身份证命中法院执行名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); - @SuppressWarnings("rawtypes") + /*@SuppressWarnings("rawtypes") List courtdetailList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("court_details")),HashMap.class); StringBuffer sb = new StringBuffer(); for(int j=0;j detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中信贷逾期名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") @@ -299,18 +299,18 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg ="规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中车辆租赁违约名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg ="规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中法院结案名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); - @SuppressWarnings("rawtypes") + /*@SuppressWarnings("rawtypes") List courtdetailList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("court_details")),HashMap.class); StringBuffer sb = new StringBuffer(); for(int j=0;j detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证_姓名命中法院失信模糊名单".equals(riskItemList.get(i).get("risk_name"))){ @@ -350,7 +350,7 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证_姓名命中法院执行模糊名单".equals(riskItemList.get(i).get("risk_name"))){ @@ -359,7 +359,7 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证_姓名命中法院结案模糊名单".equals(riskItemList.get(i).get("risk_name"))){ @@ -368,62 +368,62 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List fuzzyList = JSON.parseArray(JSON.toJSONString(detailList.get(0).get("fuzzy_list_details")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+fuzzyList.get(0).get("fraud_type_display_name").toString()+"。" +"姓名:"+fuzzyList.get(0).get("fuzzy_name").toString()+"。" +"模糊身份证:"+fuzzyList.get(0).get("fuzzy_id_number").toString()+"。"; }else if("身份证命中欠款公司法人代表名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中故意违章乘车名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中欠税名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中欠税公司法人代表名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("身份证命中信贷逾期后还款名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中虚假号码库".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中通信小号库".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中诈骗骚扰库".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + // +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中高风险关注名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + //+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中信贷逾期名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") @@ -447,19 +447,19 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + //+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中欠款公司法人代表名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + //+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("手机号命中信贷逾期后还款名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + //+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("3个月内身份证关联多个申请信息".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") @@ -609,13 +609,13 @@ public class CreditBodyGuardAction { @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + //+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("申请人信息命中低风险关注名单".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); msg = "规则描述:"+detailList.get(0).get("description").toString()+"。" - +"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" + //+"风险类型:"+detailList.get(0).get("fraud_type_display_name").toString()+"。" +"匹配字段:"+detailList.get(0).get("hit_type_display_name").toString()+"。"; }else if("3个月内申请人在多个平台被放款_不包含本合作方".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") diff --git a/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java b/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java index 8a1dcd388..237099820 100644 --- a/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java +++ b/src_tenwa/com/tenwa/customer/controller/group/CheckPoundegeDate.java @@ -1,5 +1,8 @@ package com.tenwa.customer.controller.group; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.Map; @@ -45,6 +48,21 @@ public class CheckPoundegeDate { if(results.size()>0){ return "开始时间大于已有数据的结束时间！！"; } + + String endSql = "SELECT a.expiry_date FROM LPOUNDAGE_MAINTENANCE AS a WHERE expiry_date = (SELECT MAX(expiry_date) FROM LPOUNDAGE_MAINTENANCE WHERE a.charge_channel=charge_channel AND a.charge_way=charge_way) and a.charge_channel=? AND a.charge_way=?"; + List> endtime = conn.executeQuery(endSql, chargeChannel,chargeWay); + if(endtime.size()>0){ + String enddate = endtime.get(0).get("expiry_date"); + DateFormat df = new SimpleDateFormat("yyyy/MM/dd"); + Date startdate = df.parse(startDate); + Date endTime = df.parse(enddate); + long days = (startdate.getTime() - endTime.getTime()) / 1000 / 3600 / 24; + if(days!=1){ + return "开始时间比上一条数据结束时间相差大于1天！"; + } + } + + return "true"; } diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java index c5a5083ea..bff861abf 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java @@ -1,6 +1,7 @@ package com.tenwa.lease.flow.project.businessapply; import java.util.HashMap; +import java.util.List; import java.util.Map; import jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO; @@ -56,7 +57,7 @@ public class DocMailAction { bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.CONTRACT_ID, contractId); bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.FLOWUNID, flowunid); bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.ALLHANDOVERSTATUS, ALLHANDOVERSTATUS); - bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.ALLSTATUS, ALLSTATUS); + bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.ALLSTATUS, "all"); bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.IS_FLOWING, "0"); bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.INPUTTIME, StringFunction.getTodayNow()); bo.setAttributeValue(LB_FILE_MAILARCHIVING_INFO_TEMP.INPUTUSERID, userid); @@ -87,13 +88,31 @@ public class DocMailAction { } public String asSaveMailStatus(JBOTransaction tx) throws JBOException{ BizObjectManager lfmitBom = JBOFactory.getBizObjectManager(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, tx); - BizObjectManager lfmiBom = JBOFactory.getBizObjectManager(LB_FILE_MAILARCHIVING_INFO_TEMP.CLASS_NAME, tx); + //BizObjectManager lfmiBom = JBOFactory.getBizObjectManager(LB_FILE_MAILARCHIVING_INFO_TEMP.CLASS_NAME, tx); lfmitBom.createQuery("update O set MAILSTATUS = '"+MailStatus+"' where flowunid='"+flowunid+"' and libraryid='"+libraryid+"'").executeUpdate(); - lfmiBom.createQuery("update O set allstatus = '"+AllStatus+"' where flowunid='"+flowunid+"' and contract_id='"+contractid+"'").executeUpdate(); + //lfmiBom.createQuery("update O set allstatus = '"+AllStatus+"' where flowunid='"+flowunid+"' and contract_id='"+contractid+"'").executeUpdate(); return "success"; } + public String updateStatus(JBOTransaction tx) throws JBOException{ + BizObjectManager lfmitBom = JBOFactory.getBizObjectManager(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, tx); + BizObjectManager lfmiBom = JBOFactory.getBizObjectManager(LB_FILE_MAILARCHIVING_INFO_TEMP.CLASS_NAME, tx); + List alllmdt = lfmitBom.createQuery(" flowunid=:flowunid and contract_id=:contractId and MAILSTATUS='all' ").setParameter("flowunid", flowunid).setParameter("contractId", contractid).getResultList(false); + List nonelmdt = lfmitBom.createQuery(" flowunid=:flowunid and contract_id=:contractId and MAILSTATUS='none' ").setParameter("flowunid", flowunid).setParameter("contractId", contractid).getResultList(false); + String sql = "update O set allstatus = '"; + if(alllmdt.size()>0&&nonelmdt.size()>0){ + sql = sql+"part"; + }else if(alllmdt.size()==0&&nonelmdt.size()>0){ + sql = sql+"none"; + }else if(alllmdt.size()>0&&nonelmdt.size()==0){ + sql = sql+"all"; + }else{ + sql = sql+"null"; + } + lfmiBom.createQuery(sql+"' where flowunid='"+flowunid+"' and contract_id='"+contractid+"'").executeUpdate(); + return "success"; + } public String asSaveHandOverStatus(JBOTransaction tx) throws JBOException{ BizObjectManager lfmitBom = JBOFactory.getBizObjectManager(LM_MAILONLINE_DOC_TEMP.CLASS_NAME, tx); BizObjectManager lfmiBom = JBOFactory.getBizObjectManager(LB_FILE_MAILARCHIVING_INFO_TEMP.CLASS_NAME, tx);