From c5d25b68dafd75d26ded83b6c2b39cbe6b317562 Mon Sep 17 00:00:00 2001 From: fys Date: Sat, 16 Jun 2018 18:06:39 +0800 Subject: [PATCH] =?UTF-8?q?YongSheng.F=EF=BC=9A=201=EF=BC=8Capp=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=94=B3=E8=AF=B7=E5=90=8E=EF=BC=8C=E5=90=91=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9Eflowunid=E3=80=82=202=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apply/business/start/bo/BusinessBO.java | 2 +- .../impl/BusinessApplyStartServiceImpl.java | 25 ++++++++++++++----- .../als/base/awe/select/SelectCatalogWin.java | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java index 06567986d..b0d08abcb 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java @@ -58,7 +58,7 @@ public class BusinessBO { this.certtype = fieldMap.get("certtype".toLowerCase()) == null ? null : fieldMap.get("certtype".toLowerCase()).toString(); this.certid = fieldMap.get("certid".toLowerCase()) == null ? null - : fieldMap.get("carAttributes".toLowerCase()).toString(); + : fieldMap.get("certid".toLowerCase()).toString(); } public String getCarAttributes() { diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java index a9096e9fc..40d80b0a5 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/service/impl/BusinessApplyStartServiceImpl.java @@ -1,5 +1,6 @@ package apx.com.amarsoft.als.apzl.apply.business.start.service.impl; +import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -10,6 +11,7 @@ import com.amarsoft.awe.util.Transaction; import com.base.constant.RestfullConstant; import com.base.util.MultipartDataUtil; import com.base.util.ReturnMapUtil; +import com.tenwa.flow.action.comm.CommonAction; import com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction; import apx.com.amarsoft.als.apzl.apply.business.start.bo.BusinessBO; @@ -44,21 +46,32 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService + "@'leasehold':'" + bo.getLeasehold() + "'@'carSystem':'" + bo.getCarSystem() + "'}"; BusinessApprovalStartAction.setProductID(bo.getProductId()); - BusinessApprovalStartAction.setCustomerType(bo.getCustomerType()); BusinessApprovalStartAction.setCarAttributes(bo.getCarAttributes()); BusinessApprovalStartAction.setLeasehold(bo.getLeasehold()); BusinessApprovalStartAction.setCarSystem(bo.getCarSystem()); + BusinessApprovalStartAction.setCarSeries(bo.getCarSeries()); BusinessApprovalStartAction.setFixedFlowParam(param); BusinessApprovalStartAction.setProductId(bo.getProductId()); + //用户信息 + BusinessApprovalStartAction.setCertid(bo.getCertid()); + BusinessApprovalStartAction.setCustname(bo.getCUSTOMERNAME()); + BusinessApprovalStartAction.setCustomerType(bo.getCustomerType()); + String sReturnInfo = BusinessApprovalStartAction.initFLow(tx); - - if (sReturnInfo.startsWith("success")) - ReturnMapUtil.setReturnMap(null, + if (sReturnInfo.startsWith("success")){ + //获取当前申请的相关参数，包含FlowUnid + Map params = BusinessApprovalStartAction.getFlowParam(); + //返回前台的数据 + Map body = new HashMap(); + body.put("flowUnid",params.get("FlowUnid")); + body.put("objectNo",params.get("FlowUnid")); + ReturnMapUtil.setReturnMap(body, RestfullConstant.baseProperty.get("success").toString(), - "发起成功"); + "发起成功"); + } else ReturnMapUtil.setReturnMap(null, - RestfullConstant.baseProperty.get("fail").toString(), + RestfullConstant.baseProperty.get("FAIL").toString(), "发起失败"); return ReturnMapUtil.getReturnMap(); diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java index 1d97297bb..cbabdb902 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java @@ -258,7 +258,7 @@ public class SelectCatalogWin { Map row = new HashMap(); int count = rsmd.getColumnCount(); List> colList = new ArrayList>(); - for (int i = 1; i <= count; i++) { + for (int i = 1; i <= aSelFieldName.length; i++) { Map col = new HashMap(); String key = rsmd.getColumnLabel(i); String value = rs.getString(i);