From 272a78f4c4345c211862539f5d8efa1692f4a0b3 Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 22 Sep 2023 17:15:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E8=AF=84=E5=88=86=E5=92=8C=E5=8F=8D=E6=AC=BA=E8=AF=88=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Project/BusinessApplication/RCScoreResult.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp index dd2fe370b..81c3e8b92 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/RCScoreResult.jsp @@ -24,10 +24,10 @@ +sWebRootPath+detailUrl+compClientID+"&flowunid="+sFlowUnid+"&projectNo="+projectNo+"\">", CurPage.getObjectWindowOutput()); System.out.println("info ----- >" +sFlowUnid); - + String isHistory=CurPage.getParameter("IsHistory"); String sButtons[][] = { - {"true","","Button","评分请求","评分请求","amp()","","","","btn_icon_saveNew",""}, - {"true","","Button","反欺诈","反欺诈","afs()","","","","btn_icon_saveNew",""}, + {"true".equals(isHistory)?"false":"true","","Button","评分请求","评分请求","amp()","","","","btn_icon_saveNew",""}, + {"true".equals(isHistory)?"false":"true","","Button","反欺诈","反欺诈","afs()","","","","btn_icon_saveNew",""}, {"true","","Button","查询评分结果","查询评分结果","queryScoreResult()","","","","btn_icon_saveNew",""}, {"true","","Button","查询评分报告","查询评分报告","queryScoreResultUrl()","","","","btn_icon_saveNew",""} }; From d5f1d53c846000499b87eee8d9eefbc1c97bb1ff Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 22 Sep 2023 17:17:37 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E8=AF=84=E5=88=86=E5=8E=86=E5=8F=B2=E5=A2=9E=E5=8A=A0tran=5Fno?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_oti.xml | 1 + src/com/ample/esb/controller/AmpController.java | 7 +++++-- src/com/ample/esb/service/impl/AmpServiceImpl.java | 13 ++++++++++++- src_jbo/jbo/oti/RC_SCORE_LOG.java | 5 +++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml index 1e779c77e..fcce21e71 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_oti.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_oti.xml @@ -882,6 +882,7 @@ + diff --git a/src/com/ample/esb/controller/AmpController.java b/src/com/ample/esb/controller/AmpController.java index 82a89b12f..bbaf9cad6 100644 --- a/src/com/ample/esb/controller/AmpController.java +++ b/src/com/ample/esb/controller/AmpController.java @@ -22,9 +22,11 @@ public class AmpController { Map map = new HashMap(); map.put("flowUnid",flowUnid); map.put("operatorId",operatorId); + map.put("tranNo",DateUtils.dateTimeNowAccurate()); AmpService as = new AmpServiceImpl(map); Transaction tran = as.transactionDo(); String result = resultAnalysis(tran); + saveScoreLog(tran,map.get("tranNo")); as.resetFraudTakenCode(); return result; } @@ -32,7 +34,7 @@ public class AmpController { public String resultAnalysis(Transaction tran){ String response = ""; String retCode = tran.getMessageEsbHead().getRetCode(); - saveScoreLog(tran); + if("000000".equals(retCode)){ response = "操作成功！"; }else{ @@ -40,7 +42,7 @@ public class AmpController { } return response; } - public void saveScoreLog(com.ample.esb.bean.esb.Transaction tran){ + public void saveScoreLog(com.ample.esb.bean.esb.Transaction tran,String tranNo){ BizObjectManager bom = null; try { bom = JBOFactory.getBizObjectManager("jbo.oti.RC_SCORE_LOG"); @@ -57,6 +59,7 @@ public class AmpController { String retCode = tran.getMessageEsbHead().getRetCode(); bo.setAttributeValue("RET_CODE", retCode); bo.setAttributeValue("PROJECT_NO", projectNo); + bo.setAttributeValue("TRAN_NO", tranNo); bom.saveObject(bo); } catch (JBOException e) { e.printStackTrace(); diff --git a/src/com/ample/esb/service/impl/AmpServiceImpl.java b/src/com/ample/esb/service/impl/AmpServiceImpl.java index 1c041bde1..102e15cc4 100644 --- a/src/com/ample/esb/service/impl/AmpServiceImpl.java +++ b/src/com/ample/esb/service/impl/AmpServiceImpl.java @@ -33,9 +33,11 @@ import java.util.*; public class AmpServiceImpl extends EsbCommon implements AmpService { private String flowUnid; private String operatorId; + private String tranNo; public AmpServiceImpl(Map map){ setFlowUnid(map.get("flowUnid")); setOperatorId(map.get("operatorId")); + setTranNo(map.get("tranNo")); } public void resetFraudTakenCode(){ BizObjectManager bom = null; @@ -133,6 +135,7 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { private BizObject boCft; //经销商正式表 private BizObject boDi; + /** * 往bean里面填值 * @throws JBOException @@ -996,7 +999,7 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { app.setNumber(number); app.setApplicationType("APF"); app.setOriginalSystemId("APF"); - app.setTranNo(DateUtils.dateTimeNowAccurate()); + app.setTranNo(tranNo); app.setFirstProposalDate(minTime); app.setLastProposalDate(maxTime); app.setFaName(faName); @@ -1204,4 +1207,12 @@ public class AmpServiceImpl extends EsbCommon implements AmpService { public void setOperatorId(String operatorId) { this.operatorId = operatorId; } + + public String getTranNo() { + return tranNo; + } + + public void setTranNo(String tranNo) { + this.tranNo = tranNo; + } } diff --git a/src_jbo/jbo/oti/RC_SCORE_LOG.java b/src_jbo/jbo/oti/RC_SCORE_LOG.java index d3ab1cfa9..de91499da 100644 --- a/src_jbo/jbo/oti/RC_SCORE_LOG.java +++ b/src_jbo/jbo/oti/RC_SCORE_LOG.java @@ -53,4 +53,9 @@ public interface RC_SCORE_LOG { public static final String FRAUD_TAKEN_CODE = "FRAUD_TAKEN_CODE"; public static final String SCORE_RESULT_CODE = "SCORE_RESULT_CODE"; + + /** + * 流水号 STRING(20)
+ */ + public static final String TRAN_NO = "TRAN_NO"; } \ No newline at end of file From 56388ead12e865c1d236da8869f73a11b7586bed Mon Sep 17 00:00:00 2001 From: "zhanglei@ap-leasing.com.cn" Date: Fri, 22 Sep 2023 17:39:10 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=AD=E5=8F=B0-?= =?UTF-8?q?=E8=AF=84=E5=88=86=E5=8E=86=E5=8F=B2=E5=B1=95=E7=A4=BA=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/ample/esb/controller/AmpController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/ample/esb/controller/AmpController.java b/src/com/ample/esb/controller/AmpController.java index bbaf9cad6..113a88160 100644 --- a/src/com/ample/esb/controller/AmpController.java +++ b/src/com/ample/esb/controller/AmpController.java @@ -1,6 +1,7 @@ package com.ample.esb.controller; import com.amarsoft.are.jbo.*; +import com.amarsoft.are.util.StringFunction; import com.amarsoft.dict.als.manage.NameManager; import com.ample.esb.bean.esb.MessageEsbHead; import com.ample.esb.bean.esb.Transaction; @@ -55,7 +56,7 @@ public class AmpController { String userName = NameManager.getUserName(operatorId); bo.setAttributeValue("INPUTUSERNAME",userName); bo.setAttributeValue("FLOW_UNID",flowUnid); - bo.setAttributeValue("INPUTTIME", DateUtils.dateTimeNow()); + bo.setAttributeValue("INPUTTIME", StringFunction.getTodayNow()); String retCode = tran.getMessageEsbHead().getRetCode(); bo.setAttributeValue("RET_CODE", retCode); bo.setAttributeValue("PROJECT_NO", projectNo); From 2cf16d9064a29dd15bc990d6c66d0af08dcd5027 Mon Sep 17 00:00:00 2001 From: yjf <2211675158@qq.com> Date: Fri, 22 Sep 2023 18:49:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=9F=A5=E8=AF=A2=E8=B7=B3=E8=BD=AC=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/CustomerHistory/LoanedInfo.jsp | 4 +- .../Comm/CustomerHistory/OutstandInfo.jsp | 7 ++-- .../BusinessProjectTempInfo.jsp | 23 ++++++----- .../CustomerFamilyJoinTempInfo.jsp | 30 +++++++------- src/com/amarsoft/app/flow/FlowAction.java | 40 ++++++++++++++----- .../ProjectHisInsertBusiness.java | 3 +- 6 files changed, 66 insertions(+), 41 deletions(-) diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp index a63ec5ee2..db18776e7 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/LoanedInfo.jsp @@ -49,10 +49,10 @@ } let sTaskNo = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getFlowEndRelativeTaskNo", "ObjectNo="+flowunid+",projectId="+projectId); if(typeof(sTaskNo)=="undefined" || sTaskNo.length==0) { - alert("流程未结束,无法查看！"); + alert("流程任务不存在,请联系管理员！"); return; } - var param ="TaskNo="+sTaskNo+"&ViewID=001&RightType=ReadOnly&delTabs=扣款卡信息,客户历史信息查询"; + var param ="TaskNo="+sTaskNo+"&ViewID=001&RightType=ReadOnly&IsHistory=true&delTabs=扣款卡信息,客户历史信息查询"; AsControl.OpenNewWin("/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp",param) } diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp index 9eda496ae..94eb74ba9 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/CustomerHistory/OutstandInfo.jsp @@ -42,16 +42,17 @@ function viewHisTabLocal() { var flowunid = getItemValue(0,getRow(),"FLOWUNID"); var projectId = getItemValue(0,getRow(),"PROJECT_ID"); + var businessStatus = getItemValue(0,getRow(),"BUSINESS_STATUS") if (flowunid.length == 0 && projectId.length == 0) { alert(getHtmlMessage('1'));//请选择一条信息！ return; } - let sTaskNo = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getFlowEndRelativeTaskNo", "ObjectNo="+flowunid+",projectId="+projectId); + let sTaskNo = AsControl.RunJavaMethodTrans("com.amarsoft.app.flow.FlowAction","getFlowEndRelativeTaskNo", "ObjectNo="+flowunid+",businessStatus="+businessStatus+",projectId="+projectId); if(typeof(sTaskNo)=="undefined" || sTaskNo.length==0) { - alert("流程未结束,无法查看！"); + alert("流程任务不存在,请联系管理员！"); return; } - var param ="TaskNo="+sTaskNo+"&ViewID=001&RightType=ReadOnly&delTabs=扣款卡信息,客户历史信息查询"; + var param ="TaskNo="+sTaskNo+"&ViewID=001&RightType=ReadOnly&IsHistoryNew=true&delTabs=扣款卡信息,客户历史信息查询"; AsControl.OpenNewWin("/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp",param) } diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 512b3e3e6..4f67e0c2e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -1,11 +1,10 @@ -<%@page import="com.sun.org.apache.xalan.internal.xsltc.compiler.sym"%> <%@page import="com.tenwa.reckon.product.ASObjectWindowCalc"%> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% /* Author: undefined 2017-07-10 Content: 示例详情页面 - History Log: + History Log: */ String userId= CurUser.getUserID(); String userName = CurUser.getUserName(); @@ -23,6 +22,7 @@ String customertype = CurPage.getParameter("customertype"); String channel = CurPage.getParameter("channel"); String flowName = CurPage.getParameter("FlowName"); + String ishistoryNew = CurComp.getParameter("IsHistoryNew"); String falg = "false"; @@ -40,7 +40,7 @@ if((null!=sPhaseNo&&sPhaseNo.equals("0010")) && ("BusinessApplyFlow".equals(FlowNo) ||"BusinessChangeFlow".equals(FlowNo))){ doTemp.setReadOnly("LEAS_FORM", true); doTemp.setReadOnly("PROJECT_SOURCE", false); - + }; if("ReadOnly".equals(rightType)){ doTemp.setReadOnly("INPUTNAME", true); @@ -70,12 +70,13 @@ dwTemp.setGroupHidden("0020"); dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); dwTemp.replaceColumn("customer_info", "", CurPage.getObjectWindowOutput()); + if ("true".equals(ishistoryNew)) falg = "false"; String sButtons[][] = { {falg,"","Button","保存","保存","save()","","","","btn_icon_saveNew",""}, {"true","","Button","资料清单","资料清单","openFileList('1')","","","","btn_icon_saveNew",""}, {("BusinessApplyFlow".equals(FlowNo)||"BusinessChangeFlow".equals(FlowNo))&&("0030".equals(sPhaseNo)||"0040".equals(sPhaseNo)||"0050".equals(sPhaseNo)||"0060".equals(sPhaseNo)||"0070".equals(sPhaseNo))?"true":"false","","Button","信审资料","信审资料","openFileList('2')","","","","btn_icon_saveNew",""} }; - + %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp index 5ce85d2a3..6df0e952d 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerFamilyJoinTempInfo.jsp @@ -4,7 +4,7 @@ /* Author: undefined 2018-06-27 Content: 示例详情页面 - History Log: + History Log: */ String sPrevUrl = CurPage.getParameter("PrevUrl"); String customerType = CurPage.getParameter("CustomerType"); @@ -15,8 +15,9 @@ String showtype = CurPage.getParameter("ShowType"); String sPhaseNo=CurPage.getParameter("PhaseNo"); String IsHistory = CurPage.getParameter("IsHistory"); + String ishistoryNew = CurComp.getParameter("IsHistoryNew"); if(sPrevUrl == null) sPrevUrl = ""; - + String falg = "false"; if("0010".equals(sPhaseNo) || "0020".equals(sPhaseNo) ){ @@ -59,7 +60,8 @@ }else{ dwTemp.genHTMLObjectWindow(FlowUnid); } - } + } + if ("true".equals(ishistoryNew)) falg = "false"; String sButtons[][] = { //{"true","","Button","新增","新增","newRecord()","","","","btn_icon_add"}, {falg,"","Button","保存","保存","viewAndEdit()","","","","btn_icon_edit"}, @@ -96,7 +98,7 @@ //$("#FULLNAME").attr("style","color:red;"); $("#TEL").css("color","red"); } - + var certResult = checkCertIdAll(); if(certResult=="4"){ //$("#FULLNAME").attr("style","color:red;"); @@ -227,11 +229,11 @@ } if("Ind01"==certtype){ if(certId.length!=18){ - setErrorTips("certid","身份证必须是18位！"); + setErrorTips("certid","身份证必须是18位！"); return false; } if(CheckLicense(certId)){ - setErrorTips("certid",""); + setErrorTips("certid",""); return true; }else{ setErrorTips("certId","身份证格式不正确!"); @@ -267,7 +269,7 @@ return false; } */ } - + function checkSuphone(){//校验单位电话格式和不为空 var suphone = getItemValue(0,getRow(0),"suphone"); if(suphone==""){ @@ -284,7 +286,7 @@ return false; } } - + function checkTelRepeat(){//校验共同申请人手机号重复 var customerType = "03"; var tel = getItemValue(0,getRow(),"tel"); @@ -417,7 +419,7 @@ function returnList(){ AsControl.OpenView("<%=sPrevUrl%>", "","_self",""); } - + //根据身份证号判断性别 function ValidityCheck(){ var certID = getItemValue(0,getRow(),"CERTID"); @@ -447,7 +449,7 @@ }else{ setItemReadOnly(0,0,"SEX",false); } - + checkCertidRepeat(); birthdayCheck(); } @@ -488,7 +490,7 @@ setErrorTips("CERTID",""); return true; } - + function checkMobileAll(mobile){//检验所有手机号 var sParams = "mobile="+mobile+",flowunid="+"<%=flowunid%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkTel",sParams); @@ -500,8 +502,8 @@ var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkCertIdAll",sParams); return sReturnInfo; } - - function deleteRecord(){ + + function deleteRecord(){ var ID = getItemValue(0,getRow(),"ID"); if(typeof(ID) == "undefined" || ID.length == 0 ){ alert("无数据可删除 "); @@ -514,4 +516,4 @@ } } -<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/src/com/amarsoft/app/flow/FlowAction.java b/src/com/amarsoft/app/flow/FlowAction.java index 606b46a46..25287429d 100644 --- a/src/com/amarsoft/app/flow/FlowAction.java +++ b/src/com/amarsoft/app/flow/FlowAction.java @@ -69,6 +69,7 @@ public class FlowAction { private String AssignSumbitType;// 指派处理方式 private String nextNodeType; private String projectId; //项目id + private String businessStatus; //业务状态 private FlowService flowService; @@ -236,6 +237,14 @@ public class FlowAction { return projectId; } + public String getBusinessStatus() { + return businessStatus; + } + + public void setBusinessStatus(String businessStatus) { + this.businessStatus = businessStatus; + } + //处理重复提交数据重复,只适用单体服务 private static Set taskSet = new HashSet<>(); @@ -747,16 +756,29 @@ public class FlowAction { */ public String getFlowEndRelativeTaskNo(JBOTransaction tx) throws Exception { String taskSerialNo = ""; - String sql = "select ft.RELATIVESERIALNO from flow_bussiness_object fbo join flow_task ft on fbo.flow_unid = ft.objectno where fbo.flow_name = '业务申请流程' and ft.phaseno = '1000'"; - if (StringUtils.isNotBlank(objectNo)) { - sql += " and fbo.flow_unid = '" + objectNo + "'"; - } else { - sql += " and fbo.proj_id = '" + projectId + "'"; - } + String sql = null; Transaction Sqlca = Transaction.createTransaction(tx); - ASResultSet asResultSet = Sqlca.getASResultSet(new SqlObject(sql)); - if (asResultSet.next()) { - taskSerialNo = asResultSet.getString("RELATIVESERIALNO"); + if (StringUtils.isNotBlank(businessStatus)) { //流程中处理 + if ("业务取消".equals(businessStatus)) { + sql = "select serialno as RELATIVESERIALNO from flow_task where objectno = '" + objectNo + "' order by begintime desc limit 1"; + } else { + sql = "select ft.serialno as RELATIVESERIALNO from flow_task ft join flow_object fo on ft.objectno = fo.objectno and ft.phaseno = fo.phaseno where ft.objectno = '" + objectNo + "'"; + } + ASResultSet as = Sqlca.getASResultSet(new SqlObject(sql)); + if (as.next()) { + taskSerialNo = as.getString("RELATIVESERIALNO"); + } + } else { + sql = "select ft.RELATIVESERIALNO from flow_bussiness_object fbo join flow_task ft on fbo.flow_unid = ft.objectno where fbo.flow_name = '业务申请流程' and ft.phaseno = '1000'"; + if (StringUtils.isNotBlank(objectNo)) { + sql += " and fbo.flow_unid = '" + objectNo + "'"; + } else { + sql += " and fbo.proj_id = '" + projectId + "'"; + } + ASResultSet asResultSet = Sqlca.getASResultSet(new SqlObject(sql)); + if (asResultSet.next()) { + taskSerialNo = asResultSet.getString("RELATIVESERIALNO"); + } } return taskSerialNo; } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java index 32cacdd8b..75d64a02a 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/ProjectHisInsertBusiness.java @@ -15,8 +15,7 @@ public class ProjectHisInsertBusiness extends BaseBussiness { @Override public Object run(Transaction Sqlca) throws Exception { - this.initBussinessParam(Sqlca); - String flowunid = this.getAttribute("FlowUnid").toString(); + String flowunid = this.getAttribute("ObjectNo").toString(); StringBuilder querySqlSb = new StringBuilder(); querySqlSb.append(" select certid from customer_family_temp where Partner_ = 'Y' and flowunid = '"+flowunid+"'") From 04088b7fc89c04f83d8545958efc1d93c2b9ee4d Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Sun, 24 Sep 2023 14:54:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowInstanceTrack/FlowInstanceTrack.jsp | 4 +- .../FlowInstanceTrackBusiness.jsp | 63 +++++++++++++++++++ .../BusinessApplication/ApprovalForm.jsp | 20 ++++-- .../BusinessApplication/RCScoreResult.jsp | 18 ++++-- 4 files changed, 94 insertions(+), 11 deletions(-) create mode 100644 WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index 936d2d6ae..bc97ee385 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -1,4 +1,5 @@ <%@page import="cn.bean.User"%> +<%@ page import="com.amarsoft.app.util.ASUserObject" %> <%@ page contentType="text/html; charset=GBK"%> <%@ include file="/Frame/resources/include/include_begin_list.jspf"%> <%@include file="/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf" %> @@ -33,14 +34,13 @@ <% String soft = CurPage.getParameter("soft"); String userId = CurUser.getUserID(); - ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack3"); doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator"); String ros = "true"; if("业务申请分担".equals(soft)){ ros = "false"; - doTemp.appendJboWhere("( (O.flow_name='业务申请流程' and O.PHASENAME='信审初审') or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); + doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO in ('0030','0040','0050','0051','0052') ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); }; if("付款业务分担".equals(soft)){ ros = "false"; diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp new file mode 100644 index 000000000..c1cc4fef7 --- /dev/null +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrackBusiness.jsp @@ -0,0 +1,63 @@ +<%@page import="cn.bean.User"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<% + String PG_TITLE = "流程实例跟踪"; // 浏览器窗口标题 PG_TITLE + + String soft = CurPage.getParameter("soft"); + String userId = CurUser.getUserID(); + ArrayList roleList = CurUser.getRoleTable(); + String isRisk = "false"; + if( roleList!=null && roleList.size()>0 ){ + for(int i=0 ;i +<%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%/*~END~*/%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 1d15773aa..9ca1d90eb 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -18,6 +18,7 @@ String flowunid = CurPage.getParameter("FlowUnid"); String flowName = CurPage.getParameter("FlowName");//获取流程名称 String projectId = CurPage.getParameter("ProjectId");//获取项目id + String riskParam = CurComp.getParameter("riskParam"); String clean_lease_money = Sqlca.getString("select CLEAN_LEASE_MONEY from LC_CALC_CONDITION_TEMP where flowunid='"+flowunid+"'"); //获取合同状态 String projectstatus = Sqlca.getString("select PROJECT_STATUS from lb_project_info where id='"+projectId+"'"); @@ -36,6 +37,15 @@ doTemp.setHtmlEvent("firstchoice","onChange","changeFirstChoice"); doTemp.setHtmlEvent("secondchoice","onChange","changeSecondChoice"); doTemp.setHtmlEvent("thirdchoice","onChange","changeThirdChoice"); + + String falg = "true"; + if ( (riskParam!=null && riskParam.length() > 0 ) || "0010,0020".indexOf(phaseNo)>-1 ){ + falg = "false"; + doTemp.setReadOnly("FIRSTCHOICE",true); + doTemp.setReadOnly("FIRSTOPINION",true); + doTemp.setReadOnly("SECONDCHOICE",true); + doTemp.setReadOnly("SECONDOPINION",true); + } ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); dwTemp.Style = "2";//freeform dwTemp.setAttr("inputWidth", "163"); @@ -60,13 +70,13 @@ //复审意见展示 - if("业务申请流程".equals(flowName)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo)||"0080".equals(phaseNo))){ + if("业务申请流程".equals(flowName)&&("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo))){ doTemp.setVisible("VETO",true); }else { doTemp.setVisible("VETO",false); } - if(("业务申请流程".equals(flowName)||"业务变更流程".equals(flowName))&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo))){ + if(("业务申请流程".equals(flowName)||"业务变更流程".equals(flowName))&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo))){ dwTemp.getDataObject().setVisible("subjectname", true); }else { dwTemp.getDataObject().setVisible("subjectname", false); @@ -89,7 +99,7 @@ // dwTemp.getDataObject().setReadOnly("InterOpinion2", true); dwTemp.setGroupHidden("0040,0050"); } - }else if("0040".equals(phaseNo)||"0050".equals(phaseNo)){//复审 + }else if("0040".equals(phaseNo)||"0050".equals(phaseNo)||"0051".equals(phaseNo)||"0052".equals(phaseNo)||"0053".equals(phaseNo)){//复审 dwTemp.getDataObject().setVisible("firstchoice", true); dwTemp.getDataObject().setVisible("firstopinion", true); dwTemp.getDataObject().setReadOnly("firstchoice", true); @@ -197,7 +207,7 @@ dwTemp.genHTMLObjectWindow(flowunid); String sButtons[][] = { - {"0010,0020".indexOf(phaseNo)>-1?"false":"true","","Button","保存","保存所有修改","save()","","","",""} + {falg,"","Button","保存","保存所有修改","save()","","","",""} }; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>