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();
});
}
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/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;
+ }
+}
diff --git a/src/com/ample/esb/service/impl/AmpServiceImpl.java b/src/com/ample/esb/service/impl/AmpServiceImpl.java
index c9059d19e..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("");
@@ -385,7 +386,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();
@@ -472,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("");
//省市区
@@ -626,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("");
//省市区
@@ -817,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("");
//省市区
@@ -1017,8 +1020,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;
}
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