Merge remote-tracking branch 'origin/release20211231' into release20211231

This commit is contained in:
zzk 2023-09-20 12:18:53 +08:00
commit 5317471ea2
6 changed files with 88 additions and 36 deletions

View File

@ -542,7 +542,7 @@
setItemReadOnly(0,0,"SECONDCHOICE",true);
setItemReadOnly(0,0,"SECONDOPINION",true);
break;
case '0060'://信审复审高级
case '0051'://信审复审高级
setItemValue(0,0,"SECONDCHOICE",choiceCodeScoreDefault);
setItemRequired(0,"SECONDOPINION",true);
$("#SECONDOPINION").removeAttr("disabled");
@ -551,7 +551,7 @@
setItemReadOnly(0,0,"SECONDCHOICE",true);
setItemReadOnly(0,0,"SECONDOPINION",true);
break;
case '0070'://信审复审资深
case '0052'://信审复审资深
setItemValue(0,0,"SECONDCHOICE",choiceCodeScoreDefault);
setItemRequired(0,"SECONDOPINION",true);
$("#SECONDOPINION").removeAttr("disabled");
@ -560,7 +560,16 @@
setItemReadOnly(0,0,"SECONDCHOICE",true);
setItemReadOnly(0,0,"SECONDOPINION",true);
break;
case '0080'://信审会和贷审会
case '0053'://信审会和贷审会
setItemValue(0,0,"SECONDCHOICE",choiceCodeScoreDefault);
setItemRequired(0,"SECONDOPINION",true);
$("#SECONDOPINION").removeAttr("disabled");
defaultRcScoreResult("SECONDOPINION", opinionCodeScoreDefault, attributeCodeScoreDefault);
setItemValue(0,0,"SECONDOPINION",opinionCodeScoreDefault);
setItemReadOnly(0,0,"SECONDCHOICE",true);
setItemReadOnly(0,0,"SECONDOPINION",true);
break;
case '0060'://信审负责人
setItemValue(0,0,"THIRDCHOICE",choiceCodeScoreDefault);
setItemRequired(0,"THIRDOPINION",true);
$("#THIRDOPINION").removeAttr("disabled");
@ -569,24 +578,6 @@
setItemReadOnly(0,0,"THIRDCHOICE",true);
setItemReadOnly(0,0,"THIRDOPINION",true);
break;
case '0100'://安鹏租赁总经理
setItemValue(0,0,"THIRDCHOICE",choiceCodeScoreDefault);
setItemRequired(0,"THIRDOPINION",true);
$("#THIRDOPINION").removeAttr("disabled");
defaultRcScoreResult("THIRDOPINION", opinionCodeScoreDefault, attributeCodeScoreDefault);
setItemValue(0,0,"THIRDOPINION",opinionCodeScoreDefault);
setItemReadOnly(0,0,"THIRDCHOICE",true);
setItemReadOnly(0,0,"THIRDOPINION",true);
break;
case '0110'://信审负责人
setItemValue(0,0,"FOURCHOICE",choiceCodeScoreDefault);
setItemRequired(0,"FOUROPINION",true);
$("#FOUROPINION").removeAttr("disabled");
defaultRcScoreResult("FOUROPINION", opinionCodeScoreDefault, attributeCodeScoreDefault);
setItemValue(0,0,"FOUROPINION",opinionCodeScoreDefault);
setItemReadOnly(0,0,"FOURCHOICE",true);
setItemReadOnly(0,0,"FOUROPINION",true);
break;
}
})
@ -801,8 +792,6 @@
$('#THIRDOPINION').append(sReturn);
}
});
}
function checkOpinion(scoreDefaultResultChoice){
@ -861,27 +850,24 @@
if(checkOpinion("SECONDCHOICE")){
return;
}
}else if("<%=phaseNo%>" == "0060"){//信审复审高级
}else if("<%=phaseNo%>" == "0051"){//信审复审高级
if(checkOpinion("SECONDCHOICE")){
return;
}
}else if("<%=phaseNo%>" == "0070"){//信审复审资深
}else if("<%=phaseNo%>" == "0052"){//信审复审资深
if(checkOpinion("SECONDCHOICE")){
return;
}
}else if("<%=phaseNo%>" == "0080"){//信审会和贷审会
if(checkOpinion("THIRDCHOICE")){
}else if("<%=phaseNo%>" == "0053"){//信审会和贷审会
if(checkOpinion("SECONDCHOICE")){
return;
}
}else if("<%=phaseNo%>" == "0100"){//安鹏租赁总经理
if(checkOpinion("FOURCHOICE")){
return;
}
}else if("<%=phaseNo%>" == "0110"){//信审负责人
}else if("<%=phaseNo%>" == "0060"){//信审负责人
if(checkOpinion("THIRDCHOICE")){
return;
}
}
var updatedFields = DisplayFields[0];
if(iV_all(0)){
document.getElementById("messageBox").style.display='none';

View File

@ -56,7 +56,7 @@
var curUserId = "<%=userId%>";
var result = RunJavaMethodTrans("com.ample.esb.controller.AmpController","ampDo","flowUnid="+flowUnid+",operatorId="+curUserId);
alert(result);
self.location.reload();
}
function afs(){
var projectNo = "<%=projectNo%>";

View File

@ -10,7 +10,9 @@ import com.ample.esb.util.BaicPropertiesUtil;
import com.ample.esb.util.DateUtils;
import com.ample.esb.util.XstreamUtil;
import com.ample.sms.FileUtil;
import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
import jbo.oti.RC_SCORE_RESULT;
import org.apache.commons.collections.CollectionUtils;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@ -20,6 +22,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.List;
public class AfsResultServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@ -80,7 +83,8 @@ public class AfsResultServlet extends HttpServlet {
BizObject boRsr = null;
try {
bom = JBOFactory.getBizObjectManager(RC_SCORE_RESULT.CLASS_NAME);
boRsr = bom.createQuery("project_no=:projectNo").setParameter("projectNo",projectNo).getSingleResult(true);
String flowUnid = queryProjectTemp(projectNo);
boRsr = bom.createQuery("flow_no=:flow_no").setParameter("flow_no",flowUnid).getSingleResult(true);
boRsr.setAttributeValue("fraud_alert_code",fraudAlert);
boRsr.setAttributeValue("fraud_taken_code",actionTaken);
boRsr.setAttributeValue("update_time", DateUtils.dateTimeNowCore());
@ -104,6 +108,26 @@ public class AfsResultServlet extends HttpServlet {
return responseXml;
}
private String queryProjectTemp(String projectNo) throws JBOException {
String flowNo = null;
BizObjectManager lbProjectInfo = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME);// ÏîÄ¿ÐÅÏ¢
List<BizObject> lbProjectInfoBizObjectList = lbProjectInfo.createQuery("PROJECT_NO=:PROJECT_NO").setParameter("PROJECT_NO", projectNo).getResultList(false);
if(CollectionUtils.isNotEmpty(lbProjectInfoBizObjectList)){
for(BizObject lbProject : lbProjectInfoBizObjectList){
if(null == flowNo){
flowNo = lbProject.getAttribute("FLOWUNID").toString();
ARE.getLog().info("WriteScoreResultThread#saveUpdateScoreResult£ºflowNoTempLong=" + flowNo.substring(3));
}else {
String flowNoTemp = lbProject.getAttribute("FLOWUNID").toString();
ARE.getLog().info("WriteScoreResultThread#saveUpdateScoreResult£ºflowNoTemp=" + flowNo);
if(Long.parseLong(flowNo.substring(3)) < Long.parseLong(flowNoTemp.substring(3))){
flowNo = flowNoTemp;
}
}
}
}
return flowNo;
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
doPost(request, response);

View File

@ -18,6 +18,7 @@ public class AmpController {
AmpService as = new AmpServiceImpl(map);
Transaction tran = as.transactionDo();
String result = resultAnalysis(tran);
as.resetFraudTakenCode();
return result;
}

View File

@ -4,5 +4,6 @@ import com.ample.esb.bean.amp.ApplicationTitle;
public interface AmpService extends EsbServise{
ApplicationTitle getApplicationTitle() throws Exception;
void resetFraudTakenCode();
}

View File

@ -17,8 +17,10 @@ import com.ample.esb.util.DateUtils;
import com.ample.esb.util.XstreamUtil;
import jbo.app.tenwa.calc.*;
import jbo.app.tenwa.customer.*;
import jbo.com.tenwa.entity.comm.flow.CUSTOMER_HISTORY_INFO_TEMP;
import jbo.com.tenwa.lease.comm.*;
import jbo.oti.RC_ADDRESS_INFO;
import jbo.oti.RC_SCORE_RESULT;
import jbo.prd.PRD_SPECIFIC_LIBRARY;
import jbo.sys.FLOW_TASK;
@ -32,6 +34,23 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
setFlowUnid(map.get("flowUnid"));
setOperatorId(map.get("operatorId"));
}
public void resetFraudTakenCode(){
BizObjectManager bom = null;
BizObject boRsr = null;
try {
bom = JBOFactory.getBizObjectManager(RC_SCORE_RESULT.CLASS_NAME);
boRsr = bom.createQuery("flow_no=:flow_no").setParameter("flow_no",flowUnid).getSingleResult(true);
if(boRsr==null){
return;
}
boRsr.setAttributeValue("fraud_taken_code","");
boRsr.setAttributeValue("update_time", DateUtils.dateTimeNowCore());
bom.saveObject(boRsr);
} catch (JBOException e) {
e.printStackTrace();
}
}
@Override
public MessageEsbHead esbHead() {
MessageEsbHead head = new MessageEsbHead();
@ -273,8 +292,8 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
li.setCalcDealerSubsidyAmt(interestRate.subtract(new BigDecimal(yearRate)).doubleValue());
li.setCalcManufacturerSubsidyAmt(makerInterestTotal);
li.setCarCount(boLects.size());
li.setExposuresNumber(exposures());
li.setExposureAmount(exposuresAmount());
li.setExposuresNumber(getExposuresNumber());
li.setExposureAmount(getExposuresAmount());
li.setCarRealDownPaymentRatio(boLcct.getAttribute("FIRST_PAYMENT_RATIO").toString());
li.setCarRealDownPaymentAmt(boLcct.getAttribute("FIRST_PAYMENT").toString());
li.setFinancingRatio(1.0-boLcct.getAttribute("FIRST_PAYMENT_RATIO").getDouble());
@ -682,6 +701,7 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
}
gis.add(gr);
}
gi.setGuars(gis);
return gi;
}
public Guar getGuar(BizObject boLgu) throws Exception {
@ -1120,6 +1140,26 @@ public class AmpServiceImpl extends EsbCommon implements AmpService {
return projectSet;
}
public int getExposuresNumber() throws JBOException {
BigDecimal count = new BigDecimal("0");
for(BizObject boChit : getExposures()){
count = count.add(new BigDecimal(boChit.getAttribute("CLIENTBUYNUMBER").toString()));
}
return count.intValue();
}
public List<BizObject> getExposures() throws JBOException {
List<BizObject> boChits = JBOFactory.createBizObjectQuery(CUSTOMER_HISTORY_INFO_TEMP.CLASS_NAME,"FLOWUNID=:flowunid ").setParameter("flowunid",flowUnid).getResultList(false);
System.out.println(boChits.size());
return boChits;
}
public String getExposuresAmount() throws JBOException {
BigDecimal amount = new BigDecimal("0");
for(BizObject boChit : getExposures()){
amount = amount.add(new BigDecimal(boChit.getAttribute("EXPOSURE").toString()));
}
return amount.toString();
}
public String idDateConvert(String date){
if("2100/12/31".equals(date)){
date = "0000-00-00";