shilei
/
haojing
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

#EC_HJ102# 流程流转的门户集成的待办、待阅优化

Browse Source
main
shilei 2 years ago
parent c874fff413
commit 04d8078f75
3 changed files with 30 additions and 71 deletions
Show Stats Download Patch File Download Diff File

66
src/com/customization/dito/sendtodo/SendPortalToReadUtil.java
Unescape Escape View File

@ -24,9 +24,8 @@ 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){
public void sendToReadDataByCreateNode(String requestid,String portal_todourl,String bpm_app_workflowurl,String username,String passwd,String bpm_workflowurl,String center,String bpm_app_requesturl){
HttpRequestUtil httpRequestUtil = new HttpRequestUtil();
SendMailUtil sendMailUtil = new SendMailUtil();
@ -53,25 +52,10 @@ 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)){
@ -81,13 +65,8 @@ public class SendPortalToReadUtil {
String requestname = "";
String workflowname = "" ;
// 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 lastname = "";
String loginid = "";
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" +
@ -95,7 +74,6 @@ 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()){
@ -200,8 +178,6 @@ public class SendPortalToReadUtil {
if(matcher.matches()){
emailArray += StringUtils.isEmpty(emailArray) ? email : ","+email ;
}
bb.writeLog("emailArray:"+emailArray);
if(StringUtils.isNotEmpty(emailArray))
{
@ -234,9 +210,8 @@ public class SendPortalToReadUtil {
* 如果流程提交节点没有待办，意味着流程流转到下个节点，那么查询出来的待办都有新增，并且删除提交节点的所有待办
* @param requestid
* @param noideid
* @param user
*/
public void sendToReadDataByNode(String requestid,String noideid,User user,String portal_todourl,String bpm_app_workflowurl,String username,String passwd,String bpm_workflowurl,String center,String bpm_app_requesturl){
public void sendToReadDataByNode(String requestid,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();
SendMailUtil sendMailUtil = new SendMailUtil();
SendPortalErrorUtil sendPortalErrorUtil = new SendPortalErrorUtil();
@ -262,17 +237,6 @@ 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" +
" from workflow_requestbase t1\n" +
@ -297,13 +261,8 @@ 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");
@ -314,13 +273,9 @@ public class SendPortalToReadUtil {
String workflowname = "" ;
String requestname = "";
String loginid = "";
String lastname = "" ;
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" +
@ -341,7 +296,6 @@ public class SendPortalToReadUtil {
requestObject.put("center", center);
requestObject.put("title", requestname);
requestObject.put("taskType", taskType);
requestObject.put("actionType", actionType);
requestObject.put("createDate", processTime);
@ -447,10 +401,9 @@ 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);
sendToReadDataByCreateNode(requestid,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
} else{
@ -461,14 +414,17 @@ 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) + "...";

31
src/com/customization/dito/sendtodo/SendPortalTodoCmd.java
Unescape Escape View File

@ -63,29 +63,32 @@ public class SendPortalTodoCmd extends AbstractCommandProxy<Map<String,Object>>
String new_requestid = Util.null2String(resultBean.getResultInfo().get("requestid"));
bb.writeLog("new_requestid:"+new_requestid);
// String bpm_app_workflowurl = PropBean.getUfPropValue("bpm_app_workflowurl");
// String portal_doneurl = PropBean.getUfPropValue("portal_doneurl");
// String bpm_app_requesturl = PropBean.getUfPropValue("bpm_app_requesturl");
// String portal_todourl = PropBean.getUfPropValue("portal_todourl");
// String username = PropBean.getUfPropValue("username");
// String passwd = PropBean.getUfPropValue("passwd");
// String center = PropBean.getUfPropValue("center");
// String bpm_workflowurl = PropBean.getUfPropValue("bpm_workflowurl");
SendPortalTodoUtil sendPortalTodoUtil = new SendPortalTodoUtil();
SendPortalToReadUtil sendPortalToReadUtil = new SendPortalToReadUtil();
String portal_todourl = Constants.portal_todourl;
String bpm_app_workflowurl = Constants.bpm_app_workflowurl;
String username = Constants.username;
String passwd = Constants.passwd;
String bpm_workflowurl = Constants.bpm_workflowurl;
String center = Constants.center;
String bpm_app_requesturl = Constants.bpm_app_requesturl;
if(Util.getIntValue(requestid) == -1 && "save".equals(src)){
sendPortalTodoUtil.sendTodoDataByCreater(new_requestid,user, Constants.portal_todourl,Constants.bpm_app_workflowurl,Constants.username,Constants.passwd,Constants.bpm_workflowurl,Constants.center,Constants.bpm_app_requesturl);
sendPortalTodoUtil.sendTodoDataByCreater(new_requestid,user, portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
}else if(Util.getIntValue(requestid) == -1 && "submit".equals(src)){
sendPortalTodoUtil.sendTodoDataByCreateNode(new_requestid,nodeid,user,Constants.portal_todourl,Constants.bpm_app_workflowurl,Constants.username,Constants.passwd,Constants.bpm_workflowurl,Constants.center,Constants.bpm_app_requesturl);
sendPortalTodoUtil.sendTodoDataByCreateNode(new_requestid,nodeid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
sendPortalToReadUtil.sendToReadDataByCreateNode(new_requestid,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
}else if(Util.getIntValue(requestid)> 0 && "submit".equals(src)){
sendPortalTodoUtil.sendTodoDataByNode(requestid,nodeid,user,Constants.portal_todourl,Constants.bpm_app_workflowurl,Constants.username,Constants.passwd,Constants.bpm_workflowurl,Constants.center,Constants.bpm_app_requesturl);
sendPortalTodoUtil.sendTodoDataByNode(requestid,nodeid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
sendPortalToReadUtil.sendToReadDataByNode(requestid,nodeid,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
}else if(Util.getIntValue(requestid)> 0 && "reject".equals(src)){
sendPortalTodoUtil.sendTodoDataByReject(requestid,nodeid,user,Constants.portal_todourl,Constants.bpm_app_workflowurl,Constants.username,Constants.passwd,Constants.bpm_workflowurl,Constants.center,Constants.bpm_app_requesturl);
sendPortalTodoUtil.sendTodoDataByReject(requestid,nodeid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
}
// SendPortalTodoRunnable sendPortalTodoRunnable = new SendPortalTodoRunnable(src,new_requestid,requestid,nodeid,user);
// new Thread(sendPortalTodoRunnable).start();

4
src/com/customization/dito/sendtodo/SendPortalTodoRunnable.java
Unescape Escape View File

@ -44,12 +44,12 @@ public class SendPortalTodoRunnable implements Runnable{
}else if(Util.getIntValue(requestid) == -1 && "submit".equals(src)){
// sendPortalTodoUtil.sendTodoDataByCreateNode(new_requestid,nodeid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
// sendPortalDoneUtil.sendPortalDoneData( new_requestid, nodeid, user, portal_doneurl,bpm_app_workflowurl, username, passwd, bpm_workflowurl,bpm_app_requesturl);
sendPortalToReadUtil.sendToReadDataByCreateNode(new_requestid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
sendPortalToReadUtil.sendToReadDataByCreateNode(new_requestid,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
}else if(Util.getIntValue(requestid)> 0 && "submit".equals(src)){
// sendPortalTodoUtil.sendTodoDataByNode(requestid,nodeid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
// sendPortalDoneUtil.sendPortalDoneData( requestid, nodeid, user, portal_doneurl,bpm_app_workflowurl, username, passwd, bpm_workflowurl,bpm_app_requesturl);
sendPortalToReadUtil.sendToReadDataByNode(requestid,nodeid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
sendPortalToReadUtil.sendToReadDataByNode(requestid,nodeid,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);
}else if(Util.getIntValue(requestid)> 0 && "reject".equals(src)){
// sendPortalTodoUtil.sendTodoDataByReject(requestid,nodeid,user,portal_todourl,bpm_app_workflowurl,username,passwd,bpm_workflowurl,center,bpm_app_requesturl);

Write Preview
Loading…
Cancel
Save