wanghaiwu пре 2 недеља
родитељ
комит
5f72bbcf3a

+ 7 - 1
code/jyyy/nckd-jimin-jyyy-bd/src/main/java/nckd/jimin/jyyy/bd/plugin/msg/ecology/ChangeMessageStatePlugin.java

@@ -300,6 +300,10 @@ public class ChangeMessageStatePlugin implements IEventServicePlugin {
             content = info.getString("title") == null ? "" : info.getString("title");
         }
 
+        if(content.indexOf("<br>意见:") >= 0) {
+            content = content.substring(content.indexOf("<br>意见:") + 7);
+        }
+
         //发送人员
         Long createUserId = 0L;
         if(info != null && !StringUtils.isEmpty(info.getString("sender"))){
@@ -309,7 +313,9 @@ public class ChangeMessageStatePlugin implements IEventServicePlugin {
         DynamicObject createUser = BusinessDataServiceHelper.loadSingleFromCache(createUserId, "bos_user");
         String creator = createUser == null ? "" : createUser.getString("number");
 
-        String requestname = info.getString("title") + ", 发送人:" + creator + ", " + content;
+//        String requestname = info.getString("title") + ", 发送人:" + creator + ", " + content;
+        String requestname = content;
+
         String nodename = info.getString("operation") == null ? "circulation" : info.getString("operation");
         String workflowname = "费控人力审批流";
         String workflowcode = "nobill";

+ 4 - 1
code/jyyy/nckd-jimin-jyyy-bd/src/main/java/nckd/jimin/jyyy/bd/plugin/msg/ecology/FanweiCommonUtil.java

@@ -637,6 +637,9 @@ public final class FanweiCommonUtil {
             content = info.getMessageTitle() == null ? "" : info.getMessageTitle().getLocaleValue_zh_CN();
         }
 
+        if(content.indexOf("<br>意见:") >= 0) {
+            content = content.substring(content.indexOf("<br>意见:") + 7);
+        }
 
         //发送人员
         Long createUserId = 0L;
@@ -647,6 +650,7 @@ public final class FanweiCommonUtil {
         DynamicObject createUser = BusinessDataServiceHelper.loadSingleFromCache(createUserId, "bos_user");
         String creator = createUser == null ? "" : createUser.getString("number");
 
+
 //        String requestname = info.getTitle() + ", 发送人:" + creator + ", " + content;
 
         String requestname = content;
@@ -664,7 +668,6 @@ public final class FanweiCommonUtil {
                         DynamicObject taskInfo = BusinessDataServiceHelper.loadSingleFromCache(Long.valueOf(messageContext.getString("taskId")), "wf_task");
                         if(taskInfo != null){
                             nodename = taskInfo.getString("name");
-
                             if(taskInfo.getLong("processdefinitionid") > 0){
                                 QFilter qFilter = new QFilter("id", QCP.equals, taskInfo.getLong("processdefinitionid"));
                                 DynamicObject processdef = BusinessDataServiceHelper.loadSingle("wf_processdefinition", qFilter.toArray());