diff --git a/src/com/engine/dito/reqremark/cmd/AtRequestRemarkCmd.java b/src/com/engine/dito/reqremark/cmd/AtRequestRemarkCmd.java index 0c6bdb0f..a99e50ac 100644 --- a/src/com/engine/dito/reqremark/cmd/AtRequestRemarkCmd.java +++ b/src/com/engine/dito/reqremark/cmd/AtRequestRemarkCmd.java @@ -7,6 +7,7 @@ import com.customization.dito.sendtodo.SendPortalErrorUtil; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; import com.engine.core.interceptor.CommandContext; +import com.time.util.DateUtil; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; @@ -58,7 +59,7 @@ public class AtRequestRemarkCmd extends AbstractCommonCommand * @param userid */ public String completePortalReadData(String requestid, String nodeid,String userid){ - + String zhjkbs = "com.engine.dito.reqremark.cmd.AtRequestRemarkCmd.completePortalReadData"; String resultCode = "" ; HttpRequestUtil httpRequestUtil = new HttpRequestUtil(); SendPortalErrorUtil sendPortalErrorUtil = new SendPortalErrorUtil(); @@ -71,6 +72,8 @@ public class AtRequestRemarkCmd extends AbstractCommonCommand String center = PropBean.getUfPropValue("center"); String bpm_workflowurl = PropBean.getUfPropValue("bpm_workflowurl"); String mobileJumpUrl = PropBean.getUfPropValue("mobileJumpUrl"); + String portal_doneurl = PropBean.getUfPropValue("portal_doneurl"); + String processTime = DateUtil.getCurrentTime("yyyy-MM-dd HH:mm:ss"); BaseBean bb = new BaseBean(); RecordSet rs = new RecordSet(); @@ -105,10 +108,13 @@ public class AtRequestRemarkCmd extends AbstractCommonCommand String requestname = ""; String workflowname = "" ; + String nodeId = ""; + String nodeName = ""; - sql = " select t1.requestname,t3.workflowname\n" + + sql = " select t1.requestname,t3.workflowname,t1.currentnodeid as nodeid,d1.nodename\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; @@ -116,6 +122,8 @@ public class AtRequestRemarkCmd extends AbstractCommonCommand if (rs.next()) { workflowname = Util.null2String(rs.getString("workflowname")) ; requestname = Util.null2String(rs.getString("requestname")) ; + nodeId = Util.null2String(rs.getString("nodeid") + user.getUID()); + nodeName = Util.null2String(rs.getString("nodeName")); } @@ -126,7 +134,7 @@ public class AtRequestRemarkCmd extends AbstractCommonCommand requestObject.put("center",center); requestObject.put("title",requestname); requestObject.put("creator",workcode); - requestObject.put("taskCode", requestid+"_at_"+userid); + requestObject.put("taskCode", "weaver"+requestid+"_at_"+userid); requestObject.put("nodeId",nodeid); requestObject.put("taskType",taskType); requestObject.put("actionType",actionType); @@ -164,14 +172,45 @@ public class AtRequestRemarkCmd extends AbstractCommonCommand resultCode = msgObject.getString("resultCode"); if(!"0".equals(resultCode)){ String resultmsg = msgObject.getString("resultMsg"); - sendPortalErrorUtil.doRecordPortalErrorInfo(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,resultmsg); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,nodeid,nodename,userid,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", workcode); + requestObject.put("processStaff", workcode); + requestObject.put("processTime", processTime); + requestObject.put("isRecall", "1"); + requestObject.put("actionType", "0"); + requestObject.put("urlPC", urlPc); + requestObject.put("urlApp", urlApp); + requestObject.put("urlDing", urlDing); + + 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")) { + 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(); + bb.writeLog(e); } - return resultCode; }