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+"'")