diff --git a/src/com/customization/dito/sendtodo/HttpReqUtils.java b/src/com/customization/dito/sendtodo/HttpReqUtils.java index 384d22d8..29437639 100644 --- a/src/com/customization/dito/sendtodo/HttpReqUtils.java +++ b/src/com/customization/dito/sendtodo/HttpReqUtils.java @@ -3,6 +3,7 @@ package com.customization.dito.sendtodo; import com.sun.jersey.core.util.Base64; import okhttp3.*; import weaver.general.BaseBean; + import java.io.IOException; public class HttpReqUtils extends BaseBean{ diff --git a/src/com/customization/dito/sendtodo/HttpRequestUtil.java b/src/com/customization/dito/sendtodo/HttpRequestUtil.java index 97cb0fe6..d735ef21 100644 --- a/src/com/customization/dito/sendtodo/HttpRequestUtil.java +++ b/src/com/customization/dito/sendtodo/HttpRequestUtil.java @@ -5,7 +5,6 @@ import okhttp3.*; import weaver.general.BaseBean; import java.io.IOException; -import java.util.concurrent.TimeUnit; public class HttpRequestUtil extends BaseBean{ private int retryTimes = 2; diff --git a/src/com/customization/dito/sendtodo/SendPortalAtAddTodoCmd.java b/src/com/customization/dito/sendtodo/SendPortalAtAddTodoCmd.java index 21decdb7..a092deed 100644 --- a/src/com/customization/dito/sendtodo/SendPortalAtAddTodoCmd.java +++ b/src/com/customization/dito/sendtodo/SendPortalAtAddTodoCmd.java @@ -132,6 +132,7 @@ public class SendPortalAtAddTodoCmd { JSONArray taskObjectList = new JSONArray(); for (Map todoMap: todolist){ + bb.writeLog("================== SendPortalAtAddTodoCmd todoMap============== "+ todoMap); JSONObject taskObject = new JSONObject(); JSONArray list = new JSONArray(); JSONObject requestObject2 = new JSONObject(); diff --git a/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java b/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java index 41e8ec61..4516f7b8 100644 --- a/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalDoneUtil.java @@ -12,7 +12,6 @@ import weaver.interfaces.dito.comInfo.PropBean; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Map; public class SendPortalDoneUtil { diff --git a/src/com/customization/dito/sendtodo/SendPortalErrorUtil.java b/src/com/customization/dito/sendtodo/SendPortalErrorUtil.java index 52d2342e..01f64f78 100644 --- a/src/com/customization/dito/sendtodo/SendPortalErrorUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalErrorUtil.java @@ -64,7 +64,7 @@ public class SendPortalErrorUtil { String tablename = "" ; String tablenvalue = "" ; - for (Map.Entry entry : mainMap.entrySet()) + for (Entry entry : mainMap.entrySet()) { String fieldname = Util.null2String(entry.getKey()).trim(); String fieldvalue = Util.null2String(entry.getValue()).replace("'", "''").trim(); @@ -165,7 +165,7 @@ public class SendPortalErrorUtil { String tablename = "" ; String tablenvalue = "" ; - for (Map.Entry entry : mainMap.entrySet()) + for (Entry entry : mainMap.entrySet()) { String fieldname = Util.null2String(entry.getKey()).trim(); String fieldvalue = Util.null2String(entry.getValue()).replace("'", "''").trim(); @@ -220,7 +220,7 @@ public class SendPortalErrorUtil { if(boo) { String dataid = "" ; - sql = " select * from "+uf_table+" where uuid='"+uuid+"' " ; + sql = " select * from "+uf_table+" where modeuuid='"+uuid+"' " ; rs.writeLog("sql:"+sql); rs.execute(sql); if(rs.next()){ diff --git a/src/com/customization/dito/sendtodo/SendPortalForwardCmd.java b/src/com/customization/dito/sendtodo/SendPortalForwardCmd.java index a1dc0c68..dcebddea 100644 --- a/src/com/customization/dito/sendtodo/SendPortalForwardCmd.java +++ b/src/com/customization/dito/sendtodo/SendPortalForwardCmd.java @@ -449,7 +449,7 @@ public class SendPortalForwardCmd { jsonObject.put("center", center); jsonObject.put("title", requestname); jsonObject.put("creator", loginid); - jsonObject.put("taskCode", "weaver_zf_" + requestid+"_"+user.getUID()); + jsonObject.put("taskCode", "weaver" + requestid+"_zf_"+user.getUID()); jsonObject.put("taskType", "0"); jsonObject.put("actionType", "3"); @@ -490,37 +490,37 @@ public class SendPortalForwardCmd { } - // 增加已办 - requestObject.put("center", center); - requestObject.put("taskCode", "weaver" + requestid); - requestObject.put("nodeId", nodeId); - requestObject.put("ticketType", workflowname); - requestObject.put("title", requestname); - requestObject.put("creator", loginid); - requestObject.put("processStaff", loginid); - requestObject.put("processTime", processTime); - requestObject.put("isRecall", "1"); - requestObject.put("actionType", "0"); - requestObject.put("urlPC", urlPc); - requestObject.put("urlApp", urlApp); - requestObject.put("urlDing", urlDing); - - String auth = username + ":" + passwd; - bb.writeLog("delTodoAddDoneSendPortal done requestObject:" + requestObject.toJSONString()); - msgdata = httpRequestUtil.doPostByAuth(portal_doneurl, requestObject.toJSONString(), auth); - bb.writeLog("delTodoAddDoneSendPortal done msgdata:" + msgdata); - if (StringUtils.isNotEmpty(msgdata)) { - JSONObject msgObject = JSONObject.parseObject(msgdata); - bb.writeLog("SendPortalWithAddDoneCmd--delTodoAddDoneSendPortal--adddone--msgObject:" + msgObject.toJSONString()); - //{"resultCode":"1","resultMsg":"No Result"} - if (msgObject.containsKey("resultCode")) { - String resultCode = msgObject.getString("resultCode"); - if (!"0".equals(resultCode)) { - String resultmsg = msgObject.getString("resultMsg"); - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid, nodeId, nodeName, user.getUID() + "", requestObject.toJSONString(), resultCode, resultmsg, zhjkbs); - } - } - } +// // 增加已办 +// requestObject.put("center", center); +// requestObject.put("taskCode", "weaver" + requestid); +// requestObject.put("nodeId", nodeId); +// requestObject.put("ticketType", workflowname); +// requestObject.put("title", requestname); +// requestObject.put("creator", loginid); +// requestObject.put("processStaff", loginid); +// requestObject.put("processTime", processTime); +// requestObject.put("isRecall", "1"); +// requestObject.put("actionType", "0"); +// requestObject.put("urlPC", urlPc); +// requestObject.put("urlApp", urlApp); +// requestObject.put("urlDing", urlDing); +// +// String auth = username + ":" + passwd; +// bb.writeLog("delTodoAddDoneSendPortal done requestObject:" + requestObject.toJSONString()); +// msgdata = httpRequestUtil.doPostByAuth(portal_doneurl, requestObject.toJSONString(), auth); +// bb.writeLog("delTodoAddDoneSendPortal done msgdata:" + msgdata); +// if (StringUtils.isNotEmpty(msgdata)) { +// JSONObject msgObject = JSONObject.parseObject(msgdata); +// bb.writeLog("SendPortalWithAddDoneCmd--delTodoAddDoneSendPortal--adddone--msgObject:" + msgObject.toJSONString()); +// //{"resultCode":"1","resultMsg":"No Result"} +// if (msgObject.containsKey("resultCode")) { +// String resultCode = msgObject.getString("resultCode"); +// if (!"0".equals(resultCode)) { +// String resultmsg = msgObject.getString("resultMsg"); +// sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid, nodeId, nodeName, user.getUID() + "", requestObject.toJSONString(), resultCode, resultmsg, zhjkbs); +// } +// } +// } }catch (Exception e){ e.printStackTrace(); rs.writeLog(e); diff --git a/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java b/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java index aa2f8f3e..752d8ddd 100644 --- a/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalToReadUtil.java @@ -24,6 +24,7 @@ public class SendPortalToReadUtil { /*** * 流程发起节点，提交到下个节点，发起节点没有待办，下个节点有待办 * @param requestid + * @param user */ public void sendToReadDataByCreateNode(String requestid,User user,String portal_todourl,String bpm_app_workflowurl,String username,String passwd,String bpm_workflowurl,String center,String bpm_app_requesturl){ @@ -52,10 +53,25 @@ public class SendPortalToReadUtil { try { String processTime = DateUtil.getCurrentTime("yyyy-MM-dd HH:mm:ss"); JSONArray taskObjectList = new JSONArray(); +// int u_userid = user.getUID(); + String lastname = ""; + String loginid = "" ; +// String workcode = ""; +// String sql = " select * from (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) w where w.id = '" + u_userid + "'"; +// rs.executeQuery(sql); +// while (rs.next()) { +// workcode = Util.null2String(rs.getString("loginid")); +// } String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ; +// String app_requestUrl = bpm_app_requesturl+requestid; +// app_requestUrl = URLEncoder.encode(app_requestUrl,"UTF-8"); String replace = bpm_app_workflowurl.replace("/bpm", ""); +// String urlDing = replace+bpm_app_requesturl+requestid; +// bb.writeLog("urlDing", urlDing); +// String urlApp = replace+bpm_app_requesturl+requestid; + String urlDing = replace+bpm_app_requesturl+requestid; String urlApp = replace+bpm_app_requesturl+requestid; if(StringUtils.isNotEmpty(mobileJumpUrl)){ @@ -65,8 +81,13 @@ public class SendPortalToReadUtil { String requestname = ""; String workflowname = "" ; - String lastname = ""; - String loginid = ""; +// sql =" select t1.requestname,t1.requestmark,t3.workflowname\n" + +// " from workflow_requestbase t1\n" + +// " inner join workflow_base t3 on t1.workflowid = t3.id\n" + +// " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ +// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + +// " and t1.requestid = "+requestid ; + String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+ " from workflow_requestbase t1\n" + " inner join workflow_base t3 on t1.workflowid = t3.id\n" + @@ -74,6 +95,7 @@ public class SendPortalToReadUtil { " left join (select id,lastname,loginid from hrmresource where status = 1 union all select id,lastname,loginid from hrmresourcemanager ) h2 on h2.id = t1.creater \n" + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + " and t1.requestid = "+requestid ; + bb.writeLog("sendToReadDataByNode--sql:"+sql); rs.executeQuery(sql); if (rs.next()){ @@ -178,6 +200,8 @@ public class SendPortalToReadUtil { if(matcher.matches()){ emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ; } + + bb.writeLog("emailArray:"+emailArray); if(StringUtils.isNotEmpty(emailArray)) { @@ -210,6 +234,7 @@ public class SendPortalToReadUtil { * 如果流程提交节点没有待办，意味着流程流转到下个节点，那么查询出来的待办都有新增，并且删除提交节点的所有待办 * @param requestid * @param noideid + * @param user */ public void sendToReadDataByNode(String requestid,User user,String noideid,String portal_todourl,String bpm_app_workflowurl,String username,String passwd,String bpm_workflowurl,String center,String bpm_app_requesturl){ HttpRequestUtil httpRequestUtil = new HttpRequestUtil(); @@ -237,8 +262,19 @@ public class SendPortalToReadUtil { String taskType = "1"; try { + +// int u_userid = user.getUID(); + String lastname = ""; +// +// String workcode = ""; +// String sql = " select * from (select id, lastname,loginid from hrmresource where status = 1 union all select id, lastname,loginid from hrmresourcemanager ) w where w.id = '" + u_userid + "'"; +// rs.executeQuery(sql); +// while (rs.next()) { +// workcode = Util.null2String(rs.getString("loginid")); +// } + int count = 0 ; - String countSql=" select t2.userid \n" + + String countSql =" select t2.userid \n" + " from workflow_requestbase t1\n" + " inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + @@ -261,8 +297,13 @@ public class SendPortalToReadUtil { String urlPc = "[newtab]"+bpm_workflowurl+"/workflow/request/ViewRequestForwardSPA.jsp?requestid="+requestid ; String replace = bpm_app_workflowurl.replace("/bpm", ""); +// String urlDing = replace+bpm_app_requesturl+requestid; +//// String urlApp = bpm_app_workflowurl+"/interface/mobilelogin/loginsso.jsp?em_auth_usercode="+creator+"&forwardurl="+app_requestUrl; +// String urlApp = replace+bpm_app_requesturl+requestid; + String urlDing = replace+bpm_app_requesturl+requestid; String urlApp = replace+bpm_app_requesturl+requestid; + if(StringUtils.isNotEmpty(mobileJumpUrl)){ urlDing += "&returnUrl="+URLEncoder.encode(mobileJumpUrl,"UTF-8"); urlApp += "&returnUrl="+URLEncoder.encode(mobileJumpUrl,"UTF-8"); @@ -273,11 +314,13 @@ public class SendPortalToReadUtil { String workflowname = "" ; String requestname = ""; String loginid = ""; - String lastname = "" ; - String nodeid = "" ; - String nodename = "" ; JSONArray taskObjectList = new JSONArray(); +// sql =" select t1.workflowid,t1.requestname,t1.requestmark,t3.workflowname\n" + +// " from workflow_requestbase t1\n" + +// " inner join workflow_base t3 on t1.workflowid = t3.id\n" + +// " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + +// " and t1.requestid = " + requestid; String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+ " from workflow_requestbase t1\n" + @@ -294,12 +337,11 @@ public class SendPortalToReadUtil { requestname = Util.null2String(rs.getString("requestname")); lastname = Util.null2String(rs.getString("lastname")) ; loginid = Util.null2String(rs.getString("loginid")) ; - nodeid = Util.null2String(rs.getString("nodeid")) ; - nodename = Util.null2String(rs.getString("nodename")) ; } requestObject.put("center", center); requestObject.put("title", requestname); + requestObject.put("taskType", taskType); requestObject.put("actionType", actionType); requestObject.put("createDate", processTime); @@ -322,12 +364,14 @@ public class SendPortalToReadUtil { " and t2.isremark in ('8','9')\n" + " and t2.islasttimes = 1\n" + " and (t2.isprocessing = '' or t2.isprocessing is null)\n" + - " and t2.requestid = "+requestid +" and t2.nodeid="+nodeid ; + " and t2.requestid = "+requestid ; bb.writeLog("SendPortalToReadUtil-sendToReadDataByNode--sql:" + sql); rs.executeQuery(sql); while (rs.next()) { String lcid = Util.null2String(rs.getString("requestid")) ; + String nodeid = Util.null2String(rs.getString("nodeid")) ; + String nodename = Util.null2String(rs.getString("nodename")) ; String email = Util.null2String(rs.getString("email")) ; String staffid = Util.null2String(rs.getString("staffid")) ; @@ -348,6 +392,8 @@ public class SendPortalToReadUtil { for (int i = 0; i < taskObjectList.size(); i++) { JSONObject dataObject = taskObjectList.getJSONObject(i); String lcid = dataObject.getString("lcid"); + String nodeid = dataObject.getString("nodeid"); + String nodename = dataObject.getString("nodename"); String email = dataObject.getString("email"); String creator = dataObject.getString("creator"); String userid = dataObject.getString("userid"); @@ -401,6 +447,7 @@ public class SendPortalToReadUtil { sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,""); + }else if ("TODO-FAIL-002".equals(resultCode)){ //The task does not exist.任务不存在，则新增 sendToReadDataByCreateNode(requestid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl); @@ -414,17 +461,14 @@ public class SendPortalToReadUtil { } } } + + } } catch (Exception e) { e.printStackTrace(); } } - /*** - * - * @param messageTitle - * @return - */ private String getShortMessageTitle(String messageTitle) { if (messageTitle.length() > 20) { messageTitle = messageTitle.substring(0, 17) + "..."; diff --git a/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java index 0c913401..9771b12e 100644 --- a/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java +++ b/src/com/customization/dito/sendtodo/SendPortalTodoUtil.java @@ -236,12 +236,12 @@ public class SendPortalTodoUtil { String currentUserId = user.getUID()+"" ; String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+ - " from workflow_requestbase t1\n" + - " inner join workflow_base t3 on t1.workflowid = t3.id\n" + - " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ - " left join (select id,lastname,loginid from hrmresource where status = 1 union all select id,lastname,loginid from hrmresourcemanager ) h2 on h2.id = t1.creater \n" + - " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + - " and t1.requestid = "+requestid ; + " from workflow_requestbase t1\n" + + " inner join workflow_base t3 on t1.workflowid = t3.id\n" + + " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ + " left join (select id,lastname,loginid from hrmresource where status = 1 union all select id,lastname,loginid from hrmresourcemanager ) h2 on h2.id = t1.creater \n" + + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + + " and t1.requestid = "+requestid ; bb.writeLog("sendTodoDataByNode--sql:"+sql); rs.executeQuery(sql); @@ -502,14 +502,14 @@ public class SendPortalTodoUtil { String processTime = DateUtil.getCurrentTime("yyyy-MM-dd HH:mm:ss"); int count = 0 ; String countSql = " select t2.userid\n" + - " from workflow_requestbase t1\n" + - " inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" + - " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + - " and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1','5','7','11'))\n" + - " and t2.islasttimes = 1\n" + - " and (t2.isprocessing = '' or t2.isprocessing is null)\n" + - " and t2.requestid = "+requestid+ - " and t2.nodeid = " + noideid ; + " from workflow_requestbase t1\n" + + " inner join workflow_currentoperator t2 on t1.requestid = t2.requestid\n" + + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + + " and ((t2.isremark = '0' and (t2.takisremark is null or t2.takisremark = 0)) or t2.isremark in ('1','5','7','11'))\n" + + " and t2.islasttimes = 1\n" + + " and (t2.isprocessing = '' or t2.isprocessing is null)\n" + + " and t2.requestid = "+requestid+ + " and t2.nodeid = " + noideid ; bb.writeLog("sendTodoDataByNode--countSql:"+countSql); rs.executeQuery(countSql); @@ -531,12 +531,12 @@ public class SendPortalTodoUtil { String workflowname = "" ; String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname,h2.lastname,h2.loginid "+ - " from workflow_requestbase t1\n" + - " inner join workflow_base t3 on t1.workflowid = t3.id\n" + - " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ - " left join (select id,lastname,loginid from hrmresource where status = 1 union all select id,lastname,loginid from hrmresourcemanager ) h2 on h2.id = t1.creater \n" + - " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + - " and t1.requestid = "+requestid ; + " from workflow_requestbase t1\n" + + " inner join workflow_base t3 on t1.workflowid = t3.id\n" + + " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ + " left join (select id,lastname,loginid from hrmresource where status = 1 union all select id,lastname,loginid from hrmresourcemanager ) h2 on h2.id = t1.creater \n" + + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + + " and t1.requestid = "+requestid ; bb.writeLog("sendTodoDataByNode--sql:"+sql); diff --git a/src/com/customization/dito/sendtodo/SendPortalWithAddDoneCmd.java b/src/com/customization/dito/sendtodo/SendPortalWithAddDoneCmd.java index 00d7b518..bea3df16 100644 --- a/src/com/customization/dito/sendtodo/SendPortalWithAddDoneCmd.java +++ b/src/com/customization/dito/sendtodo/SendPortalWithAddDoneCmd.java @@ -93,7 +93,7 @@ public class SendPortalWithAddDoneCmd { bb.writeLog("=============== SendPortalWithAddDoneCmd userid =================== " + userid); bb.writeLog("=============== SendPortalWithAddDoneCmd bool =================== " + bool); //没有流程代理的情况下 - if(!bool){ +// if(!bool){ //判断是否是抄送流程 // String cus_staff = PropBean.getUfPropValue("cus_staff") ; String scopeid = "-1"; @@ -209,7 +209,7 @@ public class SendPortalWithAddDoneCmd { } } - } +// } } } catch (Exception e) { diff --git a/src/com/customization/dito/sendtodo/SendPortalWithDeleteCmd.java b/src/com/customization/dito/sendtodo/SendPortalWithDeleteCmd.java index 36618c3c..e7f63d99 100644 --- a/src/com/customization/dito/sendtodo/SendPortalWithDeleteCmd.java +++ b/src/com/customization/dito/sendtodo/SendPortalWithDeleteCmd.java @@ -1,25 +1,16 @@ package com.customization.dito.sendtodo; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.constant.Constants; -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.cfg.annotation.CommandDynamicProxy; -import com.engine.core.interceptor.AbstractCommandProxy; -import com.engine.core.interceptor.Command; import com.engine.core.interceptor.CommandContext; -import com.engine.workflow.cmd.monitor.DoDeleteCmd; import com.time.util.DateUtil; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; -import weaver.hrm.User; import weaver.interfaces.dito.comInfo.PropBean; import java.net.URLEncoder; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -50,8 +41,8 @@ public class SendPortalWithDeleteCmd { SendPortalWithDeleteToRead(lcid,currentUserId,userid); } - SendPortalAtAddTodoCmd sendPortalAtAddTodoCmd = new SendPortalAtAddTodoCmd(); - sendPortalAtAddTodoCmd.dealPortalAtRyjl(requestid); + + return null; } @@ -64,6 +55,7 @@ public class SendPortalWithDeleteCmd { */ public void SendPortalWithDeleteTodo(String requestid,String currentUserId){ + String portal_todourl = Constants.portal_todourl; String bpm_app_workflowurl = Constants.bpm_app_workflowurl; String username = Constants.username; @@ -110,11 +102,11 @@ public class SendPortalWithDeleteCmd { String currentNodeName = "" ; String sql =" select t1.requestname,t1.currentnodeid as nodeid,d1.nodename,t3.workflowname\n" + - " from workflow_requestbase t1\n" + - " inner join workflow_base t3 on t1.workflowid = t3.id\n" + - " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ - " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + - " and t1.requestid = "+requestid ; + " from workflow_requestbase t1\n" + + " inner join workflow_base t3 on t1.workflowid = t3.id\n" + + " left join workflow_nodebase d1 on d1.id = t1.currentnodeid "+ + " where (t1.deleted <> 1 or t1.deleted is null or t1.deleted = '')\n" + + " and t1.requestid = "+requestid ; bb.writeLog("SendPortalWithDeleteTodo--sql2:"+sql); diff --git a/src/com/customization/dito/sendtodo/SendPortalWithRawRunnable.java b/src/com/customization/dito/sendtodo/SendPortalWithRawRunnable.java index 48e0d091..01eedbd7 100644 --- a/src/com/customization/dito/sendtodo/SendPortalWithRawRunnable.java +++ b/src/com/customization/dito/sendtodo/SendPortalWithRawRunnable.java @@ -11,9 +11,6 @@ import weaver.hrm.User; import weaver.interfaces.dito.comInfo.PropBean; import java.net.URLEncoder; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class SendPortalWithRawRunnable implements Runnable{ diff --git a/src/com/engine/workflow/cmd/agent/AddAgentSaveCmd.java b/src/com/engine/workflow/cmd/agent/AddAgentSaveCmd.java index 7c35e205..038ece5a 100644 --- a/src/com/engine/workflow/cmd/agent/AddAgentSaveCmd.java +++ b/src/com/engine/workflow/cmd/agent/AddAgentSaveCmd.java @@ -41,15 +41,15 @@ public class AddAgentSaveCmd extends AbstractCommonCommand>{ int usertype = "2".equals(user.getLogintype()) ? 1 : 0; AgentBean bean = new AgentBean(); int agentuid = Util.getIntValue(request.getParameter("agentuid"), 0); - int isPendThing = Util.getIntValue(request.getParameter("isPendThing"), 0); bean.setAgentuid(agentuid); bean.setBegindate(Util.null2String(request.getParameter("beginDate"))); bean.setBegintime(Util.null2String(request.getParameter("beginTime"))); bean.setEnddate(Util.null2String(request.getParameter("endDate"))); bean.setEndtime(Util.null2String(request.getParameter("endTime"))); - bean.setIscreateagenter(isPendThing); + bean.setIscreateagenter(Util.getIntValue(request.getParameter("isCreateAgenter"), 0)); bean.setIsSysCreateAgenter(bean.getIscreateagenter() == 0 ? "0" : request.getParameter("isSysCreateAgenter")); - bean.setIspendthing(Util.getIntValue(request.getParameter("isPendThing"), 0)); + int isPendThing = Util.getIntValue(request.getParameter("isPendThing"), 0); + bean.setIspendthing(isPendThing); bean.setIsproxydeal(Util.getIntValue(request.getParameter("isProxyDeal"), 0)); AgentManager agentManager = new AgentManager(user); diff --git a/src/com/engine/workflow/cmd/requestForm/communication/DoSaveContentCmd.java b/src/com/engine/workflow/cmd/requestForm/communication/DoSaveContentCmd.java index 006dc423..63f6582a 100644 --- a/src/com/engine/workflow/cmd/requestForm/communication/DoSaveContentCmd.java +++ b/src/com/engine/workflow/cmd/requestForm/communication/DoSaveContentCmd.java @@ -172,7 +172,6 @@ public class DoSaveContentCmd extends AbstractCommonCommand> List> todolist = new ArrayList(); RecordSet rs = new RecordSet(); RecordSet rs1 = new RecordSet(); - Map rsojson = new HashMap<>(); try { String pattern = "(?i)atsome=\\\"\\@[0-9]*"; @@ -197,6 +196,7 @@ public class DoSaveContentCmd extends AbstractCommonCommand> List list = new ArrayList<>(userIds); if(list.size() > 0){ for(String userid : list){ + Map rsojson = new HashMap<>(); rsojson.put("requestname", requestname); rsojson.put("requestid", reqid); rsojson.put("username", new ResourceComInfo().getLastname(userid) + "(" + userid + ")"); diff --git a/src/com/engine/workflow/cmd/requestForm/communication/DoSaveReply.java b/src/com/engine/workflow/cmd/requestForm/communication/DoSaveReply.java index f694dae7..afde960c 100644 --- a/src/com/engine/workflow/cmd/requestForm/communication/DoSaveReply.java +++ b/src/com/engine/workflow/cmd/requestForm/communication/DoSaveReply.java @@ -114,7 +114,7 @@ public class DoSaveReply extends AbstractCommonCommand> { WorkflowCommunicationBiz.resetNewCommunicationReadLog(communicationId, user, remark); //抄送（不需提交）给@的人员 - CctoAtUser(nodeid,requestid,remark,user); + CctoAtUser(communicationId,nodeid,requestid,remark,user); //发送给门户抄送不需提交，待阅 toMenhuDaiyue(communicationId,requestid,nodeid,remark); @@ -131,7 +131,15 @@ public class DoSaveReply extends AbstractCommonCommand> { * @param requestid * @param remark */ - private void CctoAtUser(String nodeid, int requestid, String remark,User user) { + private void CctoAtUser(int communicationId, String nodeid, int requestid, String remark,User user) { + RecordSet rs1 = new RecordSet(); + rs1.executeQuery("select * from workflow_communicationbase where id=?", communicationId); + rs1.next(); + requestid = Util.getIntValue(rs1.getString("requestid")); + + rs1.executeQuery("select * from workflow_requestbase where requestid=?", requestid); + rs1.next(); + nodeid = Util.null2String(rs1.getString("currentnodeid")); String pattern = "(?i)atsome=\\\"\\@[0-9]*"; Pattern r = Pattern.compile(pattern); @@ -151,7 +159,7 @@ public class DoSaveReply extends AbstractCommonCommand> { List> todolist = new ArrayList(); RecordSet rs = new RecordSet(); RecordSet rs1 = new RecordSet(); - Map rsojson = new HashMap<>(); + try { String pattern = "(?i)atsome=\\\"\\@[0-9]*"; @@ -180,6 +188,7 @@ public class DoSaveReply extends AbstractCommonCommand> { List list = new ArrayList<>(userIds); if(list.size() > 0){ for(String userid : list){ + Map rsojson = new HashMap<>(); rsojson.put("requestname", requestname); rsojson.put("requestid", reqid); rsojson.put("username", new ResourceComInfo().getLastname(userid) + "(" + userid + ")");