From 936f21d63efa74a07eb8488427d62f38a23abe3a Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Thu, 14 Sep 2023 13:25:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C=E5=9C=B0=E5=9D=80=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E7=B3=BB=E7=BB=9F=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esb/service/impl/AmpServiceImpl.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/com/ample/esb/service/impl/AmpServiceImpl.java b/src/com/ample/esb/service/impl/AmpServiceImpl.java index c9059d19e..0ab5fb00c 100644 --- a/src/com/ample/esb/service/impl/AmpServiceImpl.java +++ b/src/com/ample/esb/service/impl/AmpServiceImpl.java @@ -385,7 +385,6 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { int ageInYear = DateUtils.yearDiffByDate(idBirthday,nowDay); int ageInMonth = DateUtils.monthDiffByDate(idBirthday,nowDay); String workAddressId = boCpt.getAttribute("work_address_id").getString(); - BizObject boRai = this.getAddressById(workAddressId); String workProvinceCode = boRai.getAttribute("province_code").toString(); String workCityCode = boRai.getAttribute("city_code").toString(); @@ -1017,8 +1016,24 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { } public BizObject getAddressById(String addressId) throws JBOException { + BizObject boRai = null; + + if(addressId==null || "".equals(addressId)){ + boRai.setAttributeValue("province_code",""); + boRai.setAttributeValue("city_code",""); + boRai.setAttributeValue("district_code",""); + boRai.setAttributeValue("address_detail","空地址"); + return boRai; + } BizObjectManager rcAddressInfo = JBOFactory.getBizObjectManager(RC_ADDRESS_INFO.CLASS_NAME); - BizObject boRai = rcAddressInfo.createQuery("address_id=:id").setParameter("id", addressId).getSingleResult(false); + boRai = rcAddressInfo.createQuery("address_id=:id").setParameter("id", addressId).getSingleResult(false); + + if(boRai == null){ + boRai.setAttributeValue("province_code",""); + boRai.setAttributeValue("city_code",""); + boRai.setAttributeValue("district_code",""); + boRai.setAttributeValue("address_detail","未查得地址"); + } return boRai; } From 21bf787829468ff586307718eea6ab64da3acd4b Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Thu, 14 Sep 2023 13:27:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=88=86=E7=BB=93=E6=9E=9C=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ample/esb/common/RCRequiredDataCheck.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/com/ample/esb/common/RCRequiredDataCheck.java b/src/com/ample/esb/common/RCRequiredDataCheck.java index 1dcecf5ac..b628be5ee 100644 --- a/src/com/ample/esb/common/RCRequiredDataCheck.java +++ b/src/com/ample/esb/common/RCRequiredDataCheck.java @@ -6,6 +6,7 @@ import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.awe.util.Transaction; import com.tenwa.template.check.DefaultBussinessCheck; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP; +import jbo.oti.RC_SCORE_RESULT; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -55,6 +56,27 @@ public class RCRequiredDataCheck extends DefaultBussinessCheck{ return null; } } + BizObject boRSR = JBOFactory.createBizObjectQuery(RC_SCORE_RESULT.CLASS_NAME,"select score_result_code,fraud_alert_code,fraud_taken_code from O where flow_no=:flowNo").setParameter("flowNo",ObjectNo).getSingleResult(false); + String socreCode = boRSR.getAttribute("score_result_code").toString(); + String alertCode = boRSR.getAttribute("fraud_alert_code").toString(); + String takenCode = boRSR.getAttribute("fraud_taken_code").toString(); + if("".equals(socreCode)){ + putMsg("请先评分获取评分结果"); + setPass(false); + return null; + } + if("RR".equals(socreCode)||"RD".equals(socreCode)){ + if("".equals(takenCode)){ + putMsg("请先获取反欺诈人工判定结果"); + setPass(false); + return null; + } + if("".equals(alertCode)){ + putMsg("请先获取反欺诈预警结果"); + setPass(false); + return null; + } + } putMsg("验证通过！"); setPass(true); return null; From d102b41b13c8ff9566a34567c2044541a3c4189b Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Thu, 14 Sep 2023 14:56:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?Revert=20"=E9=A3=8E=E6=8E=A7=E4=B8=AD?= =?UTF-8?q?=E5=8F=B0-=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=88=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E9=A3=8E=E9=99=A9=E9=A2=84=E8=AD=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 21bf7878 --- .../ample/esb/common/RCRequiredDataCheck.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/com/ample/esb/common/RCRequiredDataCheck.java b/src/com/ample/esb/common/RCRequiredDataCheck.java index b628be5ee..1dcecf5ac 100644 --- a/src/com/ample/esb/common/RCRequiredDataCheck.java +++ b/src/com/ample/esb/common/RCRequiredDataCheck.java @@ -6,7 +6,6 @@ import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.awe.util.Transaction; import com.tenwa.template.check.DefaultBussinessCheck; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP; -import jbo.oti.RC_SCORE_RESULT; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -56,27 +55,6 @@ public class RCRequiredDataCheck extends DefaultBussinessCheck{ return null; } } - BizObject boRSR = JBOFactory.createBizObjectQuery(RC_SCORE_RESULT.CLASS_NAME,"select score_result_code,fraud_alert_code,fraud_taken_code from O where flow_no=:flowNo").setParameter("flowNo",ObjectNo).getSingleResult(false); - String socreCode = boRSR.getAttribute("score_result_code").toString(); - String alertCode = boRSR.getAttribute("fraud_alert_code").toString(); - String takenCode = boRSR.getAttribute("fraud_taken_code").toString(); - if("".equals(socreCode)){ - putMsg("请先评分获取评分结果"); - setPass(false); - return null; - } - if("RR".equals(socreCode)||"RD".equals(socreCode)){ - if("".equals(takenCode)){ - putMsg("请先获取反欺诈人工判定结果"); - setPass(false); - return null; - } - if("".equals(alertCode)){ - putMsg("请先获取反欺诈预警结果"); - setPass(false); - return null; - } - } putMsg("验证通过！"); setPass(true); return null; From 650789f99358e0be55d8c5598f416a68a86a19e3 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 15 Sep 2023 16:22:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=88=86=E7=BB=93=E6=9E=9C=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/ample/esb/check/AMPResutCheck.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/com/ample/esb/check/AMPResutCheck.java diff --git a/src/com/ample/esb/check/AMPResutCheck.java b/src/com/ample/esb/check/AMPResutCheck.java new file mode 100644 index 000000000..d61a1b0f8 --- /dev/null +++ b/src/com/ample/esb/check/AMPResutCheck.java @@ -0,0 +1,43 @@ +package com.ample.esb.check; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.template.check.DefaultBussinessCheck; +import jbo.oti.RC_SCORE_RESULT; + +/** + * 风控中台结果校验 + * + */ +public class AMPResutCheck extends DefaultBussinessCheck{ + @Override + public Object run(Transaction Sqlca) throws Exception { + String ObjectNo = this.getAttribute("ObjectNo").toString(); + + BizObject boRSR = JBOFactory.createBizObjectQuery(RC_SCORE_RESULT.CLASS_NAME,"select score_result_code,fraud_alert_code,fraud_taken_code from O where flow_no=:flowNo").setParameter("flowNo",ObjectNo).getSingleResult(false); + String socreCode = boRSR.getAttribute("score_result_code").toString(); + String alertCode = boRSR.getAttribute("fraud_alert_code").toString(); + String takenCode = boRSR.getAttribute("fraud_taken_code").toString(); + if("".equals(socreCode)){ + putMsg("请先评分获取评分结果"); + setPass(false); + return null; + } + if("RR".equals(socreCode)||"RD".equals(socreCode)){ + if("".equals(takenCode)){ + putMsg("请先获取反欺诈人工判定结果"); + setPass(false); + return null; + } + if("".equals(alertCode)){ + putMsg("请先获取反欺诈预警结果"); + setPass(false); + return null; + } + } + putMsg("验证通过！"); + setPass(true); + return null; + } +} From 03f0f2915c883e1ff5797613727a018ef74103d6 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 15 Sep 2023 16:26:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=A3=8E=E9=99=A9=E5=8F=8D=E9=A6=88=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E6=80=BB=E4=BB=B7=EF=BC=8C?= =?UTF-8?q?=E8=81=8C=E5=8A=A1=E7=AD=89=E5=8F=96=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/ample/esb/service/impl/AmpServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/ample/esb/service/impl/AmpServiceImpl.java b/src/com/ample/esb/service/impl/AmpServiceImpl.java index 0ab5fb00c..2b96e60ac 100644 --- a/src/com/ample/esb/service/impl/AmpServiceImpl.java +++ b/src/com/ample/esb/service/impl/AmpServiceImpl.java @@ -237,7 +237,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { li.setMakerInterestTotal(makerInterestTotal); li.setMakerInterestTotalDeposit(""); li.setIsSubsity(IsSubsity); - li.setContractPriceTotal(boLcct.getAttribute("EQUIP_AMT").toString()); + //风险张琬璐要求改为商务条件页面的总价款 + li.setContractPriceTotal(boLcct.getAttribute("TOTAL_ALL").toString()); li.setMonthInterestRate(interestRate.divide(new BigDecimal("12"),4,BigDecimal.ROUND_HALF_UP).toString()); li.setPayType("银行卡直扣"); li.setPayRemark(""); @@ -471,7 +472,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { ci.setAreaCode(""); ci.setExtentionNbr(""); ci.setPhoneTypeCde(""); - ci.setDesignationCde(""); + //职务 风险张琬璐要求用这个字段 + ci.setDesignationCde(empPositionCode); ci.setCityCde(""); ci.setStateCde(""); //省市区 @@ -625,7 +627,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { co.setAreaCode(""); co.setExtentionNbr(""); co.setPhoneTypeCde(""); - co.setDesignationCde(""); + //职务 风险张琬璐要求用这个字段 + co.setDesignationCde(empPositionCode); co.setCityCde(""); co.setStateCde(""); //省市区 @@ -816,7 +819,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { gr.setAreaCode(""); gr.setExtentionNbr(""); gr.setPhoneTypeCde(""); - gr.setDesignationCde(""); + //职务 风险张琬璐要求用这个字段 + gr.setDesignationCde(empPositionCode); gr.setCityCde(""); gr.setStateCde(""); //省市区 From c1ddccb666d803402bd5337f20730a0f2c66854b Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 15 Sep 2023 17:27:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8F=8D=E6=AC=BA=E8=AF=88-=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=90=8C=E6=AD=A5=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/AppConfig/OrgUserManage/UserList.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/AppConfig/OrgUserManage/UserList.jsp b/WebContent/AppConfig/OrgUserManage/UserList.jsp index 20c921c14..07be9a6f5 100644 --- a/WebContent/AppConfig/OrgUserManage/UserList.jsp +++ b/WebContent/AppConfig/OrgUserManage/UserList.jsp @@ -76,6 +76,7 @@ } var syncResult = RunJavaMethodTrans("com.ample.esb.controller.AccountSyncController","accountSyncDo","userId="+sUserID+",userName="+sUserName+",afsState="+afsState+",operatorId="+operatorId); alert(syncResult); + reloadSelf(); }); } From aed9162f177820bb0eb507f5e7dd044dfcc4f6f1 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Mon, 18 Sep 2023 09:43:34 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE=E8=BD=A6=E5=9E=8B=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E5=8C=97=E8=B4=A2=E8=BD=A6=E5=9E=8B=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Apzl/productCar/LmProductAndCarList.jsp | 4 +- WebContent/WEB-INF/etc/jbo/jbo_oti.xml | 21 +++++++ src_jbo/jbo/oti/RC_CAR_MODEL.java | 63 +++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 src_jbo/jbo/oti/RC_CAR_MODEL.java diff --git a/WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp b/WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp index b3bb132e3..7ea72b96c 100644 --- a/WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp +++ b/WebContent/Tenwa/Apzl/productCar/LmProductAndCarList.jsp @@ -7,7 +7,7 @@ History Log: */ String TYPENO= CurPage.getParameter("TYPENO"); - ASObjectModel doTemp = new ASObjectModel("LmProductAndCarList"); + ASObjectModel doTemp = new ASObjectModel("BaicProductAndCarList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 @@ -28,7 +28,7 @@ var Return="<%=CurUser.getUserID()%>@~<%=CurUser.getOrgID()%>@~<%=StringFunction.getTodayNow()%>@~<%=TYPENO%>@~"; productid="<%=TYPENO%>"; - AsDialog.OpenSelector("SelectCarInfo","productid,"+productid,"dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px", + AsDialog.OpenSelector("SelectCarInfoBaic","productid,"+productid,"dialogWidth=" + parseInt(window.screen.width * 0.6) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px", function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="") { diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml index e6834a395..ddd35093c 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml @@ -866,5 +866,26 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src_jbo/jbo/oti/RC_CAR_MODEL.java b/src_jbo/jbo/oti/RC_CAR_MODEL.java new file mode 100644 index 000000000..3f719422f --- /dev/null +++ b/src_jbo/jbo/oti/RC_CAR_MODEL.java @@ -0,0 +1,63 @@ +package jbo.oti; + +/** + * 北财车型库 - JBO命名常量类

+ * Note: This file is generated by ADE tools, dont modify it.
+ + */ +public interface RC_CAR_MODEL { + /** + * 北财车型库

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.oti.RC_CAR_MODEL"; + /** + * 唯一标识 LONG(64)
+ */ + public static final String ID = "ID"; + /** + * 品牌唯一标识 LONG(64)
+ */ + public static final String brand_id = "brand_id"; + /** + * 品牌名称 LONG(64)
+ */ + public static final String brand_name = "brand_name"; + /** + * 车系ID
+ */ + public static final String series_id = "series_id"; + + /** + * 车系名 STRING(20)
+ */ + public static final String series_name = "series_name"; + /** + * 车型id STRING(50)
+ */ + public static final String model_id = "model_id"; + /** + * 车型配置编码 STRING(32)
+ */ + public static final String model_code = "model_code"; + /** + * 车型名称 STRING(32)
+ */ + public static final String model_name = "model_name"; + /** + * 指导价 STRING(32)
+ */ + public static final String model_plants_price = "model_plants_price"; + /** + * 零售均价 STRING(100)
+ */ + public static final String model_average_price = "model_average_price"; + /** + * 车辆类型 STRING(100)
+ */ + public static final String car_type = "car_type"; + /** + * 车辆类型编码 STRING(990)
+ */ + public static final String car_type_code = "car_type_code"; +} \ No newline at end of file