From 8cb7713c7ebe7a3124314b4856ecc081b094c848 Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Tue, 26 Sep 2023 17:44:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseFunction/BaseFlowListFunction.jspf | 9 +++++++ .../CheckBussinessOpinion.jsp | 26 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CheckBussinessOpinion.jsp diff --git a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf index 84b319ff0..7d0a2d4ed 100644 --- a/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf +++ b/WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf @@ -107,6 +107,15 @@ function doSubmit(){ return; } if(assignFinish=="1"){assignSubmitType="0";} + var sPhaseNo = param["PhaseNo"]; + //业务校验审批审意见 + if(("BusinessApplyFlow"==param["FlowNo"])&&("0040"==sPhaseNo ||"0050"==sPhaseNo ||"0051"==sPhaseNo ||"0052"==sPhaseNo ||"0053"==sPhaseNo)){ + var returnOpinion = AsControl.RunJsp('/Tenwa/Lease/Flow/Project/BusinessApplication/CheckBussinessOpinion.jsp','sObjectNo='+param["ObjectNo"]); + if("false"==allTrim(returnOpinion)){ + alert("初审和复审意见不一致，请检查！！！"); + return; + } + } FlowFunction.doSubmit(param["ObjectType"],param["ObjectNo"],param["TaskNo"],param["FlowName"],param["FlowNo"],param["PhaseNo"],false,assignSubmitType); } function backStep(){ diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CheckBussinessOpinion.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CheckBussinessOpinion.jsp new file mode 100644 index 000000000..3a01f3814 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CheckBussinessOpinion.jsp @@ -0,0 +1,26 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/IncludeBeginMDAJAX.jsp"%><% + String sObjectNo = CurPage.getParameter("sObjectNo"); + try{ + String sql = " select case when t1.p1 = t2.p2 then 'true' else 'false' end as returnOpinion from lb_project_info_temp lpit "+ + " left join ( select fo1.phasechoice as p1,ft1.objectno as f1 from "+ + " flow_opinion_business fo1 left join flow_task ft1 on ft1.relativeobjectno = fo1.serialno "+ + " where ft1.objectno = '"+sObjectNo+"' and ft1.phaseno = '0030' "+ + " and ft1.relativeobjectno is not null and ft1.begintime = ( select max(f.begintime) from flow_task f where f.objectno = ft1.objectno and f.phaseno = '0030' group by f.phaseno) "+ + " ) t1 on t1.f1 = lpit.FLOWUNID left join ( "+ + " select fo1.phasechoice as p2,ft1.objectno as f2 from "+ + " flow_opinion_business fo1 left join flow_task ft1 on ft1.relativeobjectno = fo1.serialno "+ + " where ft1.objectno = '"+sObjectNo+"' and ft1.phaseno in ('0040', '0050', '0051', '0052', '0053') "+ + " and ft1.relativeobjectno is not null "+ + " and ft1.begintime = ( select max(f.begintime) from flow_task f where f.objectno = ft1.objectno and f.phaseno in ('0040', '0050', '0051', '0052', '0053') group by f.phaseno) "+ + " ) t2 on t2.f2 = lpit.FLOWUNID where lpit .FLOWUNID = '"+sObjectNo+"' "; + ASResultSet res = Sqlca.getASResultSet(new SqlObject(sql)); + while(res.next()){ + out.print(res.getString("returnOpinion")); + } + }catch(Exception e){ + e.printStackTrace(); + out.print("FALSE"); + } + +%><%@ include file="/IncludeEndAJAX.jsp"%> \ No newline at end of file From 3212080969a1da3cce5f0269837058fff68255a5 Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Tue, 26 Sep 2023 18:30:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Frame/page/ow/RequiredRuleUpdator.jsp | 2 +- .../Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp index 19f55619f..2029af610 100644 --- a/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp +++ b/WebContent/Frame/page/ow/RequiredRuleUpdator.jsp @@ -27,6 +27,6 @@ try{ }catch(Exception e){ //e.printStackTrace();2018/07/08 by zhulh 找不到校验文件没啥好大惊小怪的 ARE.getLog().error(e.getMessage()); - out.print("fail:"+ e.toString()); + //out.print("fail:"+ e.toString()); } %> \ No newline at end of file diff --git a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp index bc97ee385..e071a6b2a 100644 --- a/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp +++ b/WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp @@ -33,6 +33,7 @@ <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List03;Describe=定义数据对象;]~*/%> <% String soft = CurPage.getParameter("soft"); + String type = CurPage.getParameter("type"); String userId = CurUser.getUserID(); ASObjectModel doTemp = new ASObjectModel("FlowInstanceTrack3"); doTemp.setDataQueryClass("com.amarsoft.awe.dw.ui.list.FlowMonitorListHtmlGenerator"); @@ -40,7 +41,11 @@ String ros = "true"; if("业务申请分担".equals(soft)){ ros = "false"; - doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO in ('0030','0040','0050','0051','0052') ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); + if("reexamine".equals(type)){//添加复审数据 + doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO in ('0040','0050','0051','0052') ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); + }else{ + doTemp.appendJboWhere("( (O.APPLYTYPE='BusinessApplyApply' and O.PHASENO='0030' ) or ( O.flow_name='业务变更流程' and O.PHASENAME='信审专员初审') )"); + } }; if("付款业务分担".equals(soft)){ ros = "false";