diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java index b656bc3b8..cc9791940 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/product/ProductBaseLoanTools.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Vector; +import jbo.prd.BUSINESS_TYPE; import jbo.sys.CODE_LIBRARY; import apx.com.amarsoft.als.base.cache.instance.AppAweDoCache; @@ -203,6 +204,14 @@ public class ProductBaseLoanTools { appList = new ArrayList>(); ProductCondition pc = new ProductCondition(); pc.getProductFundRulesApp(appList, productId); + + + //获取产品名称 + BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID") + .setParameter("productID", productId).getSingleResult(false); + String productName = bo.getAttribute("typename").getString(); + + ProductBaseLoanTools.addAppList(appList, "PRODUCT_NAME", "coldefaultvalue", productName); /* 设置模板属性 */ Vector vali = new Vector(); String calcRules = pc.getProductRulesApp(appList, productId, vali); diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java index 61d50f629..cdbd59e35 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/loan/service/impl/LoanSimulationBasicServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import jbo.prd.BUSINESS_TYPE; import apx.com.amarsoft.als.apzl.apply.business.loan.manage.LCRentPlanTempDoQueryManage; import apx.com.amarsoft.als.apzl.apply.business.loan.manage.LoanSimulationBasicInfoAppInfoDoManage; import apx.com.amarsoft.als.apzl.apply.business.loan.manage.LoanSimulationBasicInfoAppInfoSaveDoManage; @@ -16,6 +17,7 @@ import apx.com.amarsoft.als.apzl.apply.business.loan.service.LoanSimulationBasic import com.amarsoft.app.lc.workflow.action.GetFlowAction; import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; @@ -66,7 +68,15 @@ public class LoanSimulationBasicServiceImpl implements body.put("productId", baseMap.get("productId")); body.put("productDatas", appList); body.put("productFundRules", calcRulesMap); - + // 获取产品名称 + BizObject bo = JBOFactory + .createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME, + "typeno=:productID") + .setParameter("productID", baseMap.get("productId").toString()) + .getSingleResult(false); + String productName = bo.getAttribute("typename").getString(); + body.put("productName", productName); + ReturnMapUtil.setReturnMap(body, RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); @@ -178,10 +188,11 @@ public class LoanSimulationBasicServiceImpl implements String result = cte.run(); Map body = JsonUtil.str2JSONObject(result); - - ReturnMapUtil.setReturnMap(body, - RestfullConstant.baseProperty.get("success").toString(), - ""); + + ReturnMapUtil + .setReturnMap(body, + RestfullConstant.baseProperty.get("success") + .toString(), ""); return ReturnMapUtil.getReturnMap(); } catch (Exception e) { ReturnMapUtil.setReturnMap(null, @@ -195,7 +206,7 @@ public class LoanSimulationBasicServiceImpl implements public Map rent(HttpServletRequest request, HttpServletResponse response, JBOTransaction tx, Transaction sqlca, ReturnMapUtil ReturnMapUtil) throws Exception { - + Map testMap = (Map) MultipartDataUtil .readRequestParam(request, "UTF-8"); fieldMap = (Map) testMap.get("fieldMap"); @@ -215,7 +226,7 @@ public class LoanSimulationBasicServiceImpl implements LCRentPlanTempDoQueryManage manage = new LCRentPlanTempDoQueryManage(); manage.setDono("LCRentPlanTempApp2"); manage.setsAddWhere(" and " + planCName + "='" + plannumber + "'"); -// manage.setsJboClass(conditionTB); + // manage.setsJboClass(conditionTB); manage.setFieldMap(fieldMap); return manage.queryDefaultDo(request, sqlca, tx, ReturnMapUtil); } 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 8105a5718..6ae2dbccf 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 @@ -6,6 +6,8 @@ import java.util.List; import java.util.Map; import jbo.app.LB_DOCLIBRARY; +import jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP; +import jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP; import jbo.app.tenwa.doc.LB_DOCATTRIBUTE; import jbo.app.tenwa.doc.LB_DOCRELATIVE; import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; @@ -305,14 +307,25 @@ public class BusinessBO implements Serializable { for (BizObject library : librarys) { if (doc.trim().equals( library.getAttribute("DOC_NAME").toString().trim())) { - msg += docName + " 必备 为上传资料照片,"; + msg += " [" + doc + "] 必备 未上传资料照片!\r\n"; } } } + + BizObjectManager conditionM = JBOFactory.getBizObjectManager(LC_CALC_CONDITION_TEMP.CLASS_NAME); + BizObjectManager rentM = JBOFactory.getBizObjectManager(LC_RENT_PLAN_TEMP.CLASS_NAME); + BizObject condition = conditionM.createQuery("FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", objectNo).getSingleResult(false); + BizObject rent = rentM.createQuery("FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", objectNo).getSingleResult(false); + + if (null == condition || null == rent) { + msg += " [商务条件] 没有找到业务测算信息!\r\n"; + } + + if (msg.equals("")) { return true; } - msg = msg.substring(0, msg.length() - 1); +// msg += "业务申请 提交风险预警报告"; return false; } 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 a689cd85c..4c2645650 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 @@ -101,7 +101,7 @@ public class BusinessApplyStartServiceImpl implements BusinessApplyStartService ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("success").toString(), ""); } else { String msg = bo.getMsg(); - ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("fale").toString(), msg); + ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("fail").toString(), msg); } return ReturnMapUtil.getReturnMap(); }