diff --git a/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java b/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java index 448bb3f8..9577cfe1 100644 --- a/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java +++ b/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java @@ -6,6 +6,7 @@ import com.constant.Constants; import com.customization.dito.sendtodo.HttpRequestUtil; import com.customization.dito.sendtodo.SendPortalErrorUtil; import com.time.util.DateUtil; +import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; import weaver.general.Util; @@ -92,10 +93,11 @@ public class SendPortalOverTimeSubmitUtil { bb.writeLog("sendOverTimeSubmitBytoDo--count:"+count); if(count >0){ + String currentUserId= "1"; String requestname = "" ; String workflowname = "" ; - String nodeId = "" ; - String nodeName = "" ; + String currentNodeId = "" ; + 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" + @@ -109,14 +111,14 @@ public class SendPortalOverTimeSubmitUtil { if (rs.next()){ requestname = Util.null2String(rs.getString("requestname")) ; workflowname = Util.null2String(rs.getString("workflowname")) ; - nodeId = Util.null2String(rs.getString("nodeid")) ; - nodeName = Util.null2String(rs.getString("nodeName")) ; + currentNodeId = Util.null2String(rs.getString("nodeid")) ; + currentNodeName = Util.null2String(rs.getString("nodeName")) ; } requestObject.put("center",center); requestObject.put("title",requestname); requestObject.put("taskCode","weaver"+requestid); - requestObject.put("nodeId",nodeId); + requestObject.put("nodeId",currentNodeId); requestObject.put("taskType",taskType); requestObject.put("actionType",actionType); requestObject.put("createDate",processTime); @@ -126,7 +128,7 @@ public class SendPortalOverTimeSubmitUtil { requestObject.put("urlPc",urlPc); requestObject.put("urlApp",urlApp); requestObject.put("urlDing",urlDing); - requestObject.put("nodeName",nodeName); + requestObject.put("nodeName",currentNodeName); requestObject.put("ticketType",workflowname); JSONArray taskObjectList = new JSONArray(); @@ -148,6 +150,7 @@ public class SendPortalOverTimeSubmitUtil { //归档节点抄送 String creator = rs.getString("loginid"); String staffid = rs.getString("staffid"); + bb.writeLog("sendOverTimeSubmitBytoDo:"+requestid+" creator:"+creator); if ("sysadmin".equals(creator)) { creator = "Admin"; @@ -172,10 +175,10 @@ public class SendPortalOverTimeSubmitUtil { if (msgObject.containsKey("resultCode")) { String resultCode = msgObject.getString("resultCode"); if ("0".equals(resultCode)) { - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,"",zhjkbs); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,currentUserId,requestObject.toJSONString(),resultCode,"",zhjkbs,userids); }else{ String resultmsg = msgObject.getString("resultMsg"); - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,nodeId,nodeName,userids,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,currentUserId,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs,userids); } } } @@ -216,7 +219,7 @@ public class SendPortalOverTimeSubmitUtil { String objectAction = "0" ; String objectType = "0"; try { - + String currentUserId= "1"; String cus_staff = PropBean.getUfPropValue("cus_staff") ; String scopeid = "-1"; String scope = "HrmCustomFieldByInfoType" ; @@ -288,33 +291,50 @@ public class SendPortalOverTimeSubmitUtil { //归档节点抄送 String creator = rs.getString("loginid"); String staffid = rs.getString("staffid"); + String userid = rs.getString("userid"); + bb.writeLog("monitorArchived:"+requestid+" creator:"+creator); if ("sysadmin".equals(creator)) { creator = "Admin"; } + JSONObject taskObject = new JSONObject(); + taskObject.put("creator", creator); + taskObject.put("staffid", staffid); + taskObject.put("userid", userid); + taskObjectList.add(taskObject); + } + + for(int i=0;i