From 69f831e4815360e42a10aaafd61c181875bee708 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 23 Aug 2018 19:18:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=9B=9E?= =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E5=90=8E=EF=BC=8C=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BF=A1=E5=AE=A1=E5=90=8E=E6=B5=81=E7=A8=8B=E5=9C=A8=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/amarsoft/app/flow/FlowAction.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/amarsoft/app/flow/FlowAction.java b/src/com/amarsoft/app/flow/FlowAction.java index 577b944f2..b6556d9bc 100644 --- a/src/com/amarsoft/app/flow/FlowAction.java +++ b/src/com/amarsoft/app/flow/FlowAction.java @@ -1029,7 +1029,7 @@ public class FlowAction { // 根据任务编号，查出流程的编号，阶段编号，对象类型，对象编号:新增加xuyunlong 归档每一步归档 ft = ftManager .createQuery( - "select O.flowno,O.phaseno,O.objecttype,O.objectno,O.userid,O.orgid from O where serialNo=:serialNo ") + "select O.flowno,O.phaseno,O.FLOWSTATE,O.ASSIGNEDTASKNO,O.objecttype,O.objectno,O.userid,O.orgid from O where serialNo=:serialNo ") .setParameter("serialNo", taskNo).getSingleResult(false); // 将数据保存到历史记录里 PhaseInfoArchive(ft.getAttribute("flowno").getString(), ft @@ -1071,6 +1071,16 @@ public class FlowAction { } }else{ flowService.commitAction(taskNo, phaseAction, phaseOpinion, "", tx); + + if(ft.getAttribute("FLOWSTATE").getString().equals("ANYBACK")){ //退回之后再提交 + + if(ft.getAttribute("ASSIGNEDTASKNO")!=null){ + if(ft.getAttribute("ASSIGNEDTASKNO").getString().length()>0){//如果退回再提交给原处理人要更新状态 + ftManager.createQuery("update o set FLOWSTATE='NORMAL' WHERE objectno=:objectno and endtime is null") + .setParameter("objectno", ft.getAttribute("objectno").getString()).executeUpdate(); + } + } + } } // 更新代理人 BizObject taskUser = ftManager.createQuery("select O.userId from O where O.SERIALNO=:taskNo").setParameter("taskNo", this.taskNo).getSingleResult(false); From 77f9e863328aa238f650cbc68e98ad1c9cbbc945 Mon Sep 17 00:00:00 2001 From: liuz Date: Thu, 23 Aug 2018 19:20:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E7=94=B5?= =?UTF-8?q?=E8=AF=9D=E6=A0=BC=E5=BC=8F=E6=A0=A1=E9=AA=8C=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributorApproval/LDistributorInfo.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp index 7e72b3931..13f2f8a61 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp @@ -95,8 +95,8 @@ setErrorTips("LINKMAN_TEL",""); return true; }else{ - setErrorTips("LINKMAN_TEL","电话格式不正确!"); - //alert("手机号格式不正确!"); + setErrorTips("LINKMAN_TEL","手机号格式不正确!"); + alert("手机号格式不正确!"); return false; } } @@ -108,7 +108,7 @@ return true; }else{ setErrorTips("DISTRIBUTOR_TEL","电话格式不正确!"); - //alert("电话号格式不正确!"); + alert("电话号格式不正确!"); return false; } } @@ -120,7 +120,7 @@ return true; }else{ setErrorTips("DEALER_PHONE","电话格式不正确!"); - //alert("电话号格式不正确!"); + alert("电话号格式不正确!"); return false; } } From f4f6f24f2ca558c106319e3a709f2eddd26e3bc2 Mon Sep 17 00:00:00 2001 From: liujiaji Date: Thu, 23 Aug 2018 19:23:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?app=20=E5=88=9D=E5=A7=8B=E5=8C=96=20?= =?UTF-8?q?=E9=99=84=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20mapkey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../als/apzl/apply/business/start/init/InitDocListTools.java | 5 ++++- src_core/com/tenwa/doc/action/DocListInitAction.java | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/init/InitDocListTools.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/init/InitDocListTools.java index d0078abcf..1bcbb2637 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/init/InitDocListTools.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/init/InitDocListTools.java @@ -148,7 +148,10 @@ public class InitDocListTools { : customerInfo.getAttribute("CUSTOMERTYPE") .toString(); } - other.put("customerType", customerType); + for (int i = 0; i < 10; i++) + ARE.getLog().info("customerType:"+customerType); + + other.put("CustomerType", customerType); @SuppressWarnings("deprecation") Configure CurConfig = Configure.getInstance(); // 判断是否存在，不存在就从配置表倒到临时表 diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java index ee2a24e84..44d97c5fe 100644 --- a/src_core/com/tenwa/doc/action/DocListInitAction.java +++ b/src_core/com/tenwa/doc/action/DocListInitAction.java @@ -83,6 +83,8 @@ public class DocListInitAction { relaBm.saveObject(rela); } relativeid = rela.getAttribute("id").getString(); + for (int i = 0; i < 10; i++) + ARE.getLog().info("relativeid:"+relativeid); List configList = configBm.createQuery( "doc_Class_Itemno in (" + docno + ")").getResultList(false); From 4b7d84314bfd866fd4cb140795390c329cef083c Mon Sep 17 00:00:00 2001 From: liujiaji Date: Thu, 23 Aug 2018 19:39:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/product/ProductCondition.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 483d9a3d5..df75196ee 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -587,15 +587,19 @@ public class ProductCondition { public void getProductPenaRulesApp(List> appList,String productId) throws Exception{ Map> map=ProductParamUtil.getProductComponentType(productId, "PRD0308"); - if(map.containsKey("PFD01")){//免罚息天数 + /*if(map.containsKey("PFD01")){//免罚息天数 String day=map.get("PFD01").get("PenaltyFreeDays"); if(day.length()>0){ - ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "coldefaultvalue", day); + doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day); } if("N".equals(map.get("PFD01").get("AllowModify"))){ - ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "colreadonly", "1"); + doTemp.setColumnAttribute("FREE_DEFA_INTER_DAY","colreadonly", "1"); } - } + }*/ + BizObject bo = JBOFactory.createBizObjectQuery(CONFIGURATE.CLASS_NAME,"ATTR_ID=:attrId") + .setParameter("attrId","免罚息天数配置").getSingleResult(false); + String day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString(); + ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "coldefaultvalue", day); if(map.containsKey("PENALTY_RATE_DAY")){//罚息日利率 String rate=map.get("PENALTY_RATE_DAY").get("PENALTY_RATE_DAY"); if(rate.length()>0){ @@ -870,11 +874,14 @@ public class ProductCondition { //测算年利率字段 Map> productRates = ProductParamUtil.getProductComponentType(productId, "PRD0350"); Map productRate = productRates.get("product_rate"); + String periodType = ProductParamUtil.getProductParameterValue(productId, "PRD0350", "period_type", "begin_end"); + periodType = periodType == null ? "period_type_0" : periodType; + ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType); if(productRate != null) { String incomeNumber = productRate.get("INCOME_NUMBER") == null ? "0" : productRate.get("INCOME_NUMBER"); ProductBaseLoanTools.addAppList(appList, "INCOME_NUMBER", "coldefaultvalue", incomeNumber); - String periodType = productRate.get("begin_end") == null ? "period_type_0" : productRate.get("begin_end"); - ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType); +// String periodType = productRate.get("begin_end") == null ? "period_type_0" : productRate.get("begin_end"); +// ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType); String ProductType = productRate.get("ProductType") == null ? "0" : productRate.get("ProductType"); String isReadOnly = productRate.get("ProductRateReadOnly") == null ? "Y" : productRate.get("ProductRateReadOnly"); String YEAR_RATE = productRate.get("ProductRate") == null ? "0" : productRate.get("ProductRate");