Merge branch 'hotfix/修复已完成工作删除不发消息的问题' into 'master'

hotfix/修复已完成工作删除不发消息的问题 同时合并到develop

See merge request o2oa/o2oa!1158

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/MessageFactory.java

@@ -54,7 +54,7 @@ public class MessageFactory {
 
 	public static void workCompleted_delete(WorkCompleted workCompleted) throws Exception {
 		String title = "删除完成工作:" + adjustTitle(workCompleted);
-		MessageConnector.send(MessageConnector.TYPE_WORKCOMPLETED_CREATE, title, "", workCompleted);
+		MessageConnector.send(MessageConnector.TYPE_WORKCOMPLETED_DELETE, title, "", workCompleted);
 	}
 
 	public static void task_press(Task task, String from) throws Exception {
@@ -242,4 +242,4 @@ public class MessageFactory {
 		return title;
 	}
 
-}
\ No newline at end of file
+}

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/job/ActionDelete.java

@@ -54,6 +54,7 @@ public class ActionDelete extends BaseAction {
 					emc.beginTransaction(WorkCompleted.class);
 					for (WorkCompleted o : emc.listEqual(WorkCompleted.class, WorkCompleted.job_FIELDNAME, job)) {
 						emc.remove(o);
+						MessageFactory.workCompleted_delete(o);
 						Wo wo = new Wo();
 						wo.setId(o.getId());
 						wos.add(wo);