diff --git a/src/com/customization/sendtodo/SendPortalTodoUtil.java b/src/com/customization/sendtodo/SendPortalTodoUtil.java index 961dc12a..9a7873b4 100644 --- a/src/com/customization/sendtodo/SendPortalTodoUtil.java +++ b/src/com/customization/sendtodo/SendPortalTodoUtil.java @@ -138,8 +138,10 @@ public class SendPortalTodoUtil { if("0".equals(resultCode)){ System.out.println(emailArray.toJSONString()); - String notificationSubject = ""+requestname; - String notificationContent = ""+requestname ; + + String notificationSubject = "You have a new to-do list:"+requestname+",Please handle it in time"; + String notificationContent = "You have a new to-do list:"+requestname+",Please handle it in time"; + sendMailUtil.sendMail(requestId,emailArray.toJSONString(),notificationSubject,notificationContent); }else{ @@ -283,8 +285,10 @@ public class SendPortalTodoUtil { if("0".equals(resultCode)){ System.out.println(emailArray.toJSONString()); - String notificationSubject = ""+requestname; - String notificationContent = ""+requestname ; + + String notificationSubject = "You have a new to-do list:"+requestname+",Please handle it in time"; + String notificationContent = "You have a new to-do list:"+requestname+",Please handle it in time"; + sendMailUtil.sendMail(requestid,emailArray.toJSONString(),notificationSubject,notificationContent); }else{ sendPortalErrorUtil.doCreateSendPortalTodoErrorInfo(); @@ -320,6 +324,7 @@ public class SendPortalTodoUtil { String terminal = "1" ; String taskType = "0"; String objectId = "" ; + String requestname = "" ; JSONArray emailArray = new JSONArray(); Pattern regex = Pattern.compile(EMAIL_REGEX_DEFAULT); @@ -363,6 +368,7 @@ public class SendPortalTodoUtil { rs.executeQuery(sql); if (rs.next()){ String title = Util.null2String(rs.getString("requestname")) ; + requestname = title; String creator = Util.null2String(rs.getString("loginid")) ; String taskCode = Util.null2String(rs.getString("taskcode")) ; String nodeId = Util.null2String(rs.getString("nodeid")) ; @@ -417,6 +423,7 @@ public class SendPortalTodoUtil { if (rs.next()){ String title = Util.null2String(rs.getString("requestname")) ; + requestname = title; String creator = Util.null2String(rs.getString("loginid")) ; String taskCode = Util.null2String(rs.getString("taskcode")) ; String nodeId = Util.null2String(rs.getString("nodeid")) ; @@ -496,8 +503,8 @@ public class SendPortalTodoUtil { if("0".equals(resultCode)){ System.out.println(emailArray.toJSONString()); - String notificationSubject = ""; - String notificationContent = "" ; + String notificationSubject = "You have a new to-do list:"+requestname+",Please handle it in time"; + String notificationContent = "You have a new to-do list:"+requestname+",Please handle it in time"; sendMailUtil.sendMail(requestid,emailArray.toJSONString(),notificationSubject,notificationContent); }else{ @@ -537,6 +544,7 @@ public class SendPortalTodoUtil { String objectAction = "0" ; String objectType = "0"; String objectId = "" ; + String requestname = ""; try { String actionType = "2" ; @@ -555,6 +563,7 @@ public class SendPortalTodoUtil { if (rs.next()){ String title = Util.null2String(rs.getString("requestname")) ; + requestname = title ; String creator = Util.null2String(rs.getString("loginid")) ; String taskCode = Util.null2String(rs.getString("taskcode")) ; String nodeId = Util.null2String(rs.getString("nodeid")) ; @@ -638,8 +647,10 @@ public class SendPortalTodoUtil { if("0".equals(resultCode)){ System.out.println(emailArray.toJSONString()); - String notificationSubject = ""; - String notificationContent = "" ; + + String notificationSubject = "You have a new to-do list:"+requestname+",Please handle it in time"; + String notificationContent = "You have a new to-do list:"+requestname+",Please handle it in time"; + sendMailUtil.sendMail(requestid,emailArray.toJSONString(),notificationSubject,notificationContent); }else{ diff --git a/src/weaver/interfaces/comInfo/PropBean.java b/src/weaver/interfaces/comInfo/PropBean.java index 3da915a5..06443d53 100644 --- a/src/weaver/interfaces/comInfo/PropBean.java +++ b/src/weaver/interfaces/comInfo/PropBean.java @@ -10,7 +10,7 @@ public class PropBean { public static BaseBean bb = new BaseBean(); public static String active = Util.null2String(bb.getPropValue("developProp","active")); - public static String getPropName(String pkey) + public static String getPropValue(String pkey) { if(StringUtils.isEmpty(active)){ return "";