From 353cdffe8e19a85488176564bc090b0e15e83cbc Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 7 Jan 2020 15:05:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comm/credit/CreditBodyGuardAction.java | 32 +++++++++---------- src_core/com/tenwa/util/SerialNumberUtil.java | 2 +- .../ContractApprovalStartAction.java | 8 ++++- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java index 45c91753f..72d87075b 100644 --- a/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java +++ b/src_core/com/tenwa/comm/credit/CreditBodyGuardAction.java @@ -294,7 +294,7 @@ public class CreditBodyGuardAction { } msg ="规则描述:"+detailList.get(0).get("description").toString()+"。" +"逾期次数:"+detailList.get(0).get("discredit_times").toString()+"。" - +"详情:["+sb.toString().substring(0,sb.length()-1)+"。]"; + +"详情:["+(sb.length()==0?"":sb.toString().substring(0,sb.length()-1))+"。]"; }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); @@ -445,7 +445,7 @@ public class CreditBodyGuardAction { } msg ="规则描述:"+detailList.get(0).get("description").toString()+"。" +"逾期次数:"+detailList.get(0).get("discredit_times").toString()+"。" - +"详情:["+sb.toString().substring(0,sb.length()-1)+"。]"; + +"详情:["+(sb.length()==0?"":sb.toString().substring(0,sb.length()-1))+"。]"; }else if("手机号疑似乱填".equals(riskItemList.get(i).get("risk_name"))){ msg = ""; }else if("手机号命中车辆租赁违约名单".equals(riskItemList.get(i).get("risk_name"))){ @@ -477,7 +477,7 @@ public class CreditBodyGuardAction { sb.append(StringUtil.nullToString(frequencyArray.get(j),"")+"，"); } msg = "频度规则详情:"+frequencydetailList.get(0).get("detail").toString()+"，详细:" - + "（"+sb.toString().substring(0,sb.length()-1)+"）"; + + "（"+(sb.length()==0?"":sb.toString().substring(0,sb.length()-1))+"）"; }else if("3个月内申请信息关联多个身份证".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); @@ -489,7 +489,7 @@ public class CreditBodyGuardAction { sb.append(StringUtil.nullToString(frequencyArray.get(j),"")+"，"); } msg = "频度规则详情:"+frequencydetailList.get(0).get("detail").toString()+"，详细:" - + "（"+sb.toString().substring(0,sb.length()-1)+"）"; + + "（"+(sb.length()==0?"":sb.toString().substring(0,sb.length()-1))+"）"; }else if("3个月内申请人身份证作为联系人身份证出现的次数过多".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); @@ -536,12 +536,12 @@ public class CreditBodyGuardAction { } msg = "规则描述:"+detailList.get(0).get("description").toString()+"，" +"总个数:"+detailList.get(0).get("platform_count").toString()+"，" - +"平台详情:"+sb1.toString().substring(0, sb1.length()-1)+"，" + +"平台详情:"+(sb1.length()==0?"":sb1.toString().substring(0, sb1.length()-1))+"，" +"各维度多头详情:" +"（"+platformdetaildimensionList.get(0).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(0) - .get("count").toString()+"，"+sb2.toString().substring(0,sb2.length()-1)+"），（" + .get("count").toString()+"，"+(sb2.length()==0?"":sb2.toString().substring(0,sb2.length()-1))+"），（" +platformdetaildimensionList.get(1).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(1) - .get("count").toString()+"，"+sb3.toString().substring(0, sb3.length()-1)+"）"; + .get("count").toString()+"，"+(sb3.length()==0?"":sb3.toString().substring(0, sb3.length()-1))+"）"; }else if("1个月内申请人在多个平台申请借款".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); @@ -570,12 +570,12 @@ public class CreditBodyGuardAction { } msg = "规则描述:"+detailList.get(0).get("description").toString()+"，" +"总个数:"+detailList.get(0).get("platform_count").toString()+"，" - +"平台详情:"+sb1.toString().substring(0, sb1.length()-1)+"，" + +"平台详情:"+(sb1.length()==0?"":sb1.toString().substring(0, sb1.length()-1))+"，" +"各维度多头详情:" +"（"+platformdetaildimensionList.get(0).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(0) - .get("count").toString()+"，"+sb2.toString().substring(0,sb2.length()-1)+"），（" + .get("count").toString()+"，"+(sb2.length()==0?"":sb2.toString().substring(0,sb2.length()-1))+"），（" +platformdetaildimensionList.get(1).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(1) - .get("count").toString()+"，"+sb3.toString().substring(0, sb3.length()-1)+"）"; + .get("count").toString()+"，"+(sb3.length()==0?"":sb3.toString().substring(0, sb3.length()-1))+"）"; }else if("3个月内申请人在多个平台申请借款".equals(riskItemList.get(i).get("risk_name"))){ @SuppressWarnings("rawtypes") List detailList = JSON.parseArray(JSON.toJSONString(riskItemList.get(i).get("risk_detail")),HashMap.class); @@ -604,12 +604,12 @@ public class CreditBodyGuardAction { } msg = "规则描述:"+detailList.get(0).get("description").toString()+"，" +"总个数:"+detailList.get(0).get("platform_count").toString()+"，" - +"平台详情:"+sb1.toString().substring(0, sb1.length()-1)+"，" + +"平台详情:"+(sb1.length()==0?"":sb1.toString().substring(0, sb1.length()-1))+"，" +"各维度多头详情:" +"（"+platformdetaildimensionList.get(0).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(0) - .get("count").toString()+"，"+sb2.toString().substring(0,sb2.length()-1)+"），（" + .get("count").toString()+"，"+(sb2.length()==0?"":sb2.toString().substring(0,sb2.length()-1))+"），（" +platformdetaildimensionList.get(1).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(1) - .get("count").toString()+"，"+sb3.toString().substring(0, sb3.length()-1)+"）"; + .get("count").toString()+"，"+(sb3.length()==0?"":sb3.toString().substring(0, sb3.length()-1))+"）"; }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); @@ -650,12 +650,12 @@ public class CreditBodyGuardAction { } msg = "规则描述:"+detailList.get(0).get("description").toString()+"，" +"总个数:"+detailList.get(0).get("platform_count").toString()+"，" - +"平台详情:"+sb1.toString().substring(0, sb1.length()-1)+"，" + +"平台详情:"+(sb1.length()==0?"":sb1.toString().substring(0, sb1.length()-1))+"，" +"各维度多头详情:" +"（"+platformdetaildimensionList.get(0).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(0) - .get("count").toString()+"，"+sb2.toString().substring(0,sb2.length()-1)+"），（" + .get("count").toString()+"，"+(sb2.length()==0?"":sb2.toString().substring(0,sb2.length()-1))+"），（" +platformdetaildimensionList.get(1).get("dimension").toString()+"总个数:"+platformdetaildimensionList.get(1) - .get("count").toString()+"，"+sb3.toString().substring(0, sb3.length()-1)+"）"; + .get("count").toString()+"，"+(sb3.length()==0?"":sb3.toString().substring(0, sb3.length()-1))+"）"; }else{ //continue; diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java index 7b38f2e51..aada520a6 100644 --- a/src_core/com/tenwa/util/SerialNumberUtil.java +++ b/src_core/com/tenwa/util/SerialNumberUtil.java @@ -167,7 +167,7 @@ public class SerialNumberUtil { int year = Integer.parseInt(currentYear); int month = Integer.parseInt(currentMonth); int day = Integer.parseInt(currentDay); - return SerialNumberUtil.getSerialNumberByDay("BQAP("+dept+"){year}{month}{day}{maxOrderNumber}",4,null, "合同编号", year,month,day, tx); + return SerialNumberUtil.getSerialNumberByDay(dept+"{year}{month}{day}{maxOrderNumber}",4,null, "合同编号", year,month,day, tx); } /*public static String getContractSerialNaumber(String sSerialType,JBOTransaction tx) throws Exception { diff --git a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java index a89fa54f9..4d0bd5796 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/contractapproval/ContractApprovalStartAction.java @@ -32,8 +32,9 @@ public class ContractApprovalStartAction extends BaseFlowStartAction{ String productid=bo.getAttribute("PRODUCT_ID").getString(); String deptid=bo.getAttribute("PROJECT_DEPT").getString(); String area_code=bo.getAttribute("AREA_CODE").getString(); + String subjectid=bo.getAttribute("subjectid").getString(); String contractno=""; - String dept=""; + String dept="BQAP("; /* if(deptid.equals("8000900020001")){//cx dept+="cx"; @@ -61,6 +62,11 @@ public class ContractApprovalStartAction extends BaseFlowStartAction{ }else{//回租 dept+="H"; } + if("d989246c11c111eaaa0000163e0e11e6".equals(subjectid)){ + dept+=")TJ"; + }else{ + dept+=")SZ"; + } contractno=SerialNumberUtil.getContractSerialNaumber(dept,area_code, tx); // } this.FlowParam.put("ContractNo", contractno);