From 2f693e444dc414d242d6f51cad5c17f36d7f01f9 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Tue, 31 Jul 2018 20:05:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BC=A0=E9=98=85=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E7=AC=A6=E5=90=88=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Common/WorkFlow/FlowSubmitDialog.jsp | 5 +++++ .../Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp | 2 +- .../tenwa/comm/message/controller/BusinessCancelJob.java | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp index 5d66466f8..a2d066fab 100644 --- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp +++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp @@ -183,6 +183,11 @@ var actionSet = $("#actionreadset"); if(actionSet.html().length<=2){ var actionList=routeJson.readUser; + var phaseNo=routeJson.route[0].phaseNo; + if("BusinessApplyFlow"=='<%=flowNo%>'&&"1000"!=phaseNo){ + actionList = ""; + return; + } if(actionList.length>0){ actionSet.empty().show(); actionSet.append("
请选择传阅的用户：
"); diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp index a04cba6a6..fc8720d80 100644 --- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp +++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/LcReviewAuditRentPlanList.jsp @@ -9,7 +9,7 @@ String plan_date = DateAssistant.getToday(); ASObjectModel doTemp = new ASObjectModel("ViLcReviewAuditRentPlanList"); - doTemp.setJboWhere(" O.AUDIT_STATE = 'N'"); +// doTemp.setJboWhere(" O.AUDIT_STATE = 'N'"); //默认预查询 //只有计划日期未收款的都可以收款 doTemp.setJboWhereWhenNoFilter(" and O.PLAN_DATE <= '"+plan_date+"' and O.COLLECT_STATUS in ('未收款','部分收款') "); diff --git a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java index 7e2ee2ebd..3669b122f 100644 --- a/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java +++ b/src_core/com/tenwa/comm/message/controller/BusinessCancelJob.java @@ -29,7 +29,7 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil; * */ public class BusinessCancelJob implements Job { - + public static String curUserId = ""; private String overDate; @Override public void execute(JobExecutionContext arg0) throws JobExecutionException { @@ -90,8 +90,8 @@ public class BusinessCancelJob implements Job { lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_DATE, StringFunction.getTodayNow()); lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_RESON,"系统检测到该业务超过合同制作等待发起时间:"+overDate+"天，故自动撤销该业务。"); lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTTIME,StringFunction.getTodayNow()); - lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTUSERID,"system"); - lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTORGID,"system"); + lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTUSERID,curUserId==""?"system":curUserId); + lcibo.setAttributeValue(LB_CANCLE_INFO.INPUTORGID,curUserId==""?"system":curUserId); lcibo.setAttributeValue(LB_CANCLE_INFO.PROJECT_ID,map.get("ID")); // lcibo.setAttributeValue(LB_CANCLE_INFO.CANCLE_TYPE,""); lcibom.saveObject(lcibo);