diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java index 8c3be09db..8fc0cd5f3 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java @@ -58,7 +58,7 @@ public class BusinessDocUploadServiceImpl implements BusinessDocUploadService { fieldMap = testMap != null ? (Map) testMap.get("fieldMap") : fieldMap; // 参数 fileList = testMap != null ? (List>) testMap.get("fileList") : fileList; // 资料列表 - String applyType = "BusinessApplyApply"; + String applyType = "BusinessApplyFlow"; String flowUnid = fieldMap.get("objectno") == null ? "" : fieldMap.get( "objectno").toString(); // 流程号 diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/controller/FlowDataController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/controller/FlowDataController.java index e8f03c363..6e464b071 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/controller/FlowDataController.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/controller/FlowDataController.java @@ -41,7 +41,7 @@ public class FlowDataController { } /** - * 获取流程中银行卡信息 + * 保存流程中银行卡信息 */ @Path("/save/bankcard") @POST diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java index 6fe0d121d..c69451b94 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java @@ -19,7 +19,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import apx.com.amarsoft.als.apzl.apply.business.doc.detail.process.DocLibraryStateUpdate; + import com.tenwa.apzl.comm.GpsEnum; + import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_HIS; import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP; @@ -30,6 +32,7 @@ import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; +import jbo.sys.FLOW_OBJECT; import jbo.sys.LM_GPS_ORDER_TEMP; import com.amarsoft.are.jbo.BizObject; @@ -123,7 +126,12 @@ public class FlowDataServiceImpl implements FlowDataService{ } //保存扣款卡对应的图片信息 if(fileList!=null&&fileList.size()>0){ - this.savaBankCardFile(flowParms.get("ProjectId"), flowParms.get("ApplyType"), fileList, CurUser, tx); + BizObject fo = this.getFlowObject(flowunid); + if(fo==null){ + ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "没有查询到对应的流程实例！"); + return ReturnMapUtil.getReturnMap(); + } + this.savaBankCardFile(flowParms.get("ProjectId"), fo.getAttribute("flowno").toString() , fileList, CurUser, tx); } BizObject cat = catManage.createQuery(" flowunid =:flowunid").setParameter("flowunid", flowunid).getSingleResult(true); if( cat == null ){ @@ -309,7 +317,12 @@ public class FlowDataServiceImpl implements FlowDataService{ return ReturnMapUtil.getReturnMap(); } if(fileList!=null&&fileList.size()>0){ - this.savaBankCardFile(flowParms.get("ProjectId"), flowParms.get("ApplyType"), fileList, CurUser, tx); + BizObject fo = this.getFlowObject(FlowUnid); + if(fo==null){ + ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "没有查询到对应的流程实例！"); + return ReturnMapUtil.getReturnMap(); + } + this.savaBankCardFile(flowParms.get("ProjectId"), fo.getAttribute("flowno").toString(), fileList, CurUser, tx); } BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME); @@ -769,7 +782,7 @@ public class FlowDataServiceImpl implements FlowDataService{ public void savaBankCardFile(String projectId,String applyFlow,List> fileList,ASUser user,JBOTransaction tx) throws Exception{ BizObjectManager relaManage = JBOFactory.getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME); BizObject rela = null; - if("BusinessApplyApply".equals(applyFlow)||"BusinessChangeApply".equals(applyFlow)||"BusinessCancelApply".equals(applyFlow)||"BContractApproveApply".equals(applyFlow)||"BContractCancelApply".equals(applyFlow)||"BContractChangeApply".equals(applyFlow)){ + if("BusinessApplyFlow".equals(applyFlow)||"BusinessChangeFlow".equals(applyFlow)||"BusinessCancelFlow".equals(applyFlow)||"BContractApproveFlow".equals(applyFlow)||"BContractCancelFlow".equals(applyFlow)||"BContractChangeFlow".equals(applyFlow)){ rela = relaManage.createQuery(" objecttype='BusinessApplyFlow' AND proj_id=:projectId ").setParameter("projectId", projectId).getSingleResult(false); }else{ @@ -850,4 +863,10 @@ public class FlowDataServiceImpl implements FlowDataService{ } return "image/jpeg"; } + + public BizObject getFlowObject(String flowUnid) throws Exception{ + BizObjectManager fom=JBOFactory.getBizObjectManager(FLOW_OBJECT.CLASS_NAME); + return fom.createQuery(" objectno=:objectno ").setParameter("objectno", flowUnid).getSingleResult(false); + + } } diff --git a/src_app_fresh/com/base/util/HttpClientUtil.java b/src_app_fresh/com/base/util/HttpClientUtil.java index 8a2bef1e8..b3d7ec7f7 100644 --- a/src_app_fresh/com/base/util/HttpClientUtil.java +++ b/src_app_fresh/com/base/util/HttpClientUtil.java @@ -19,9 +19,9 @@ public class HttpClientUtil { public static String getNewsData(String type,String parms) throws Exception{ String url = ""; if("bannerList".equals(type)){ - url="http://47.93.227.86/app_article/art/bannerList"; + url="http://172.28.1.59:8094/app_article/art/bannerList"; }else if ("artList".equals(type)){ - url="http://47.93.227.86/app_article/art/artList"; + url="http://172.28.1.59:8094/app_article/art/artList"; } //创建连接对象 HttpClient httpClient = new HttpClient();