From f071140c79d841c9bf480c4c1d2ac4ee04a84bd9 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Wed, 20 Sep 2023 09:20:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8C=97=E8=B4=A2=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5-=E8=AF=84=E5=88=86=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/ApprovalForm.jsp | 48 +++++++------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 5130eb4f9..fad3e38f0 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -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; } }) @@ -861,27 +852,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'; From 45eed3d5b1cd120dc9e6939e17569aeb2d1e91cf Mon Sep 17 00:00:00 2001 From: zhanglei Date: Wed, 20 Sep 2023 09:24:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8C=97=E8=B4=A2=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5-=E6=A0=B9=E6=8D=AE=E8=AF=84=E5=88=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=92=8C=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=AF=B9=E4=B8=9A=E5=8A=A1=E4=BA=BA=E5=91=98=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp | 2 -- 1 file changed, 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index fad3e38f0..268bc5cd0 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -792,8 +792,6 @@ $('#THIRDOPINION').append(sReturn); } }); - - } function checkOpinion(scoreDefaultResultChoice){ From af404730114bc129ad7a5d9a0642445f0c21f7e1 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Wed, 20 Sep 2023 11:41:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E8=AF=84=E5=88=86=E5=90=8E?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=BA=E5=B7=A5=E5=88=A4=E5=AE=9A=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApplication/RCScoreResult.jsp | 2 +- .../ample/esb/controller/AmpController.java | 1 + src/com/ample/esb/service/AmpService.java | 1 + .../esb/service/impl/AmpServiceImpl.java | 44 ++++++++++++++++++- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp index 7379e4ef2..b214074d7 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp @@ -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%>"; diff --git a/src/com/ample/esb/controller/AmpController.java b/src/com/ample/esb/controller/AmpController.java index 29e57caf2..0c042d2dd 100644 --- a/src/com/ample/esb/controller/AmpController.java +++ b/src/com/ample/esb/controller/AmpController.java @@ -18,6 +18,7 @@ public class AmpController { AmpService as = new AmpServiceImpl(map); Transaction tran = as.transactionDo(); String result = resultAnalysis(tran); + as.resetFraudTakenCode(); return result; } diff --git a/src/com/ample/esb/service/AmpService.java b/src/com/ample/esb/service/AmpService.java index 8b845f67c..88e10f4ed 100644 --- a/src/com/ample/esb/service/AmpService.java +++ b/src/com/ample/esb/service/AmpService.java @@ -4,5 +4,6 @@ import com.ample.esb.bean.amp.ApplicationTitle; public interface AmpService extends EsbServise{ ApplicationTitle getApplicationTitle() throws Exception; + void resetFraudTakenCode(); } diff --git a/src/com/ample/esb/service/impl/AmpServiceImpl.java b/src/com/ample/esb/service/impl/AmpServiceImpl.java index 2b96e60ac..137645168 100644 --- a/src/com/ample/esb/service/impl/AmpServiceImpl.java +++ b/src/com/ample/esb/service/impl/AmpServiceImpl.java @@ -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 getExposures() throws JBOException { + List 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"; From 8e5feb570d971ccc0ad845576d494bdbcb4ffc57 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Wed, 20 Sep 2023 11:43:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=8D=E6=AC=BA=E8=AF=88-=E5=8F=8D?= =?UTF-8?q?=E6=AC=BA=E8=AF=88=E5=9B=9E=E8=B0=83=E4=BF=AE=E6=94=B9=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=94=B1projectNo=E6=94=B9=E4=B8=BAflowunid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esb/controller/AfsResultServlet.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/com/ample/esb/controller/AfsResultServlet.java b/src/com/ample/esb/controller/AfsResultServlet.java index a5c38ec78..478805b89 100644 --- a/src/com/ample/esb/controller/AfsResultServlet.java +++ b/src/com/ample/esb/controller/AfsResultServlet.java @@ -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 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);