From c086f834e8d02cd0e27b193b0b500abdeccd0290 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Fri, 10 Aug 2018 00:02:19 +0800 Subject: [PATCH] =?UTF-8?q?app=E9=99=84=E4=BB=B6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BusinessDocDetailServiceImpl.java | 12 ++++++++++-- .../als/apzl/apply/business/start/bo/BusinessBO.java | 8 ++++---- .../apply/business/start/init/InitDocListTools.java | 6 +++--- .../service/impl/BusinessApplyStartServiceImpl.java | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java index 405a53d0f..63372c1cf 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java @@ -191,11 +191,19 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService { docName = docName.substring(0, docName.length() - 1); } } + + + BizObjectManager fboM = JBOFactory + .getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME); + BizObject fbo = fboM.createQuery("flow_unid=:flow_unid") + .setParameter("flow_unid", flowUnid).getSingleResult(false); + String proj_id = fbo.getAttribute("proj_id").getString(); + BizObjectManager relaManage = JBOFactory .getBizObjectManager(LB_DOCRELATIVE.CLASS_NAME); - BizObject rela = relaManage.createQuery("FLOW_UNID=:FLOW_UNID") - .setParameter("FLOW_UNID", flowUnid).getSingleResult(false); + BizObject rela = relaManage.createQuery("ObjectType='BusinessApplyFlow' and proj_id=:projid") + .setParameter("projid", proj_id).getSingleResult(false); String relaId = ""; if (null == rela) { ReturnMapUtil.setReturnMap(null, 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 aeeb560de..6c2d43407 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 @@ -276,20 +276,20 @@ public class BusinessBO implements Serializable { msg = "获取客户信息失败!"; return false; } - + String proj_id = fbo.getAttribute("proj_id").getString(); String sql = ""; sql = "SELECT DISTINCT O.ID, O.DOC_NAME,r.id " + "FROM O, " + LB_DOCRELATIVE.CLASS_NAME + " R " + "WHERE O.RELATIVE_ID = R.ID " + "AND O.ID NOT IN (SELECT A.LIBRARY_ID FROM " + LB_DOCATTRIBUTE.CLASS_NAME + " A) " - + "AND R.FLOW_UNID=:FLOW_UNID " + "AND o.DOC_NATURE='01' " + + "AND R.ObjectType='BusinessApplyFlow' and R.proj_id=:projid " + "AND o.DOC_NATURE='01' " + "ORDER BY SERIAL_NUM"; - +// R.ObjectType='BusinessApplyFlow' and R.proj_id=:projid BizObjectManager libraryManage = JBOFactory .getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); BizObjectQuery query = libraryManage.createQuery(sql).setParameter( - "FLOW_UNID", objectNo); + "projid", proj_id); List librarys = query.getResultList(false); String docNameConfig = "01".equals(customerType) ? RestfullConstant.baseProperty 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 0b070f7dc..381bb75bb 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 @@ -28,10 +28,10 @@ public class InitDocListTools { .setParameter("OBJECTNO", flowUnid).getSingleResult(false); if (null == object) return false; - String flowNo = object.getAttribute("flowno") == null ? "" : object + String sObjectType = object.getAttribute("flowno") == null ? "" : object .getAttribute("flowno").toString(); - String sObjectType = object.getAttribute("ObjectType") == null ? "" - : object.getAttribute("ObjectType").toString(); +// String sObjectType = object.getAttribute("ObjectType") == null ? "" +// : object.getAttribute("ObjectType").toString(); String productId = ""; BizObject flow = GetFlowAction.getFlowBussinessObject(flowUnid); if (null == flow) 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 f29496883..0f599c619 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 @@ -95,9 +95,9 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService fieldMap = (Map) testMap.get("fieldMap"); fileList = (List>) testMap.get("fileList"); BusinessBO bo = new BusinessBO(fieldMap, tx); -// boolean flag = bo.checkDoc(); + boolean flag = bo.checkDoc(); - if(true) { + if(flag) { ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("success").toString(), ""); } else { String msg = bo.getMsg();