anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhanglei 2023-09-26 20:04:26 +08:00
commit 4ec51c9a4d
4 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Frame/page/ow/RequiredRuleUpdator.jsp
View File

@ -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());
}
%>

7
WebContent/Tenwa/Core/FlowInstanceTrack/FlowInstanceTrack.jsp
View File

@ -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";

9
WebContent/Tenwa/Core/FlowManager/BaseFunction/BaseFlowListFunction.jspf
View File

@ -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(){

26
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CheckBussinessOpinion.jsp Normal file
View File

@ -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"%>