Browse Source

支持通过服务商服务添加任务

master
陈裕财 3 years ago
parent
commit
71af6ab3e5
  1. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 6
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java

4
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -399,7 +399,7 @@ public class XmTaskController {
String createUserid= (String) xmTaskMap.get("createUserid"); String createUserid= (String) xmTaskMap.get("createUserid");
String createUsername= (String) xmTaskMap.get("createUsername"); String createUsername= (String) xmTaskMap.get("createUsername");
for (XmTask task : can) { for (XmTask task : can) {
if(!user.getUserid().equals(createUserid) && "1".equals(task.getStatus())) {
if(!user.getUserid().equals(createUserid) && !"0".equals(task.getStatus())) {
notifyMsgService.pushMsg(user, createUserid, createUsername, "2", task.getProjectId(), task.getId(), "您成为任务【" + task.getName() + "】的负责人,请注意跟进。"); notifyMsgService.pushMsg(user, createUserid, createUsername, "2", task.getProjectId(), task.getId(), "您成为任务【" + task.getName() + "】的负责人,请注意跟进。");
} }
} }
@ -1020,7 +1020,7 @@ public class XmTaskController {
xmTaskService.batchImportFromTemplate(xmTasks); xmTaskService.batchImportFromTemplate(xmTasks);
for (XmTask t : xmTasks) { for (XmTask t : xmTasks) {
if(!user.getUserid().equals(t.getCreateUserid())) {
if(!user.getUserid().equals(t.getCreateUserid()) && !"0".equals(t.getStatus())) {
notifyMsgService.pushMsg(user, t.getCreateUserid(), t.getCreateUsername(), "2", t.getProjectId(), t.getId(), "您成为任务【" + t.getName() + "】的负责人,请注意跟进。"); notifyMsgService.pushMsg(user, t.getCreateUserid(), t.getCreateUsername(), "2", t.getProjectId(), t.getId(), "您成为任务【" + t.getName() + "】的负责人,请注意跟进。");
} }
xmRecordService.addXmTaskRecord(t.getProjectId(), t.getId(), "项目-任务-批量新增任务", "新增任务"+t.getName(),"",null); xmRecordService.addXmTaskRecord(t.getProjectId(), t.getId(), "项目-任务-批量新增任务", "新增任务"+t.getName(),"",null);

6
xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@ -287,8 +287,10 @@ public class XmTaskService extends BaseService {
//新增日志 //新增日志
xmRecordService.addXmTaskRecord(xmTask.getProjectId(), xmTask.getId(), "项目-任务-新增任务", "新增任务"+xmTask.getName()); xmRecordService.addXmTaskRecord(xmTask.getProjectId(), xmTask.getId(), "项目-任务-新增任务", "新增任务"+xmTask.getName());
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), "您成为任务【" + xmTask.getName() + "】的负责人,请注意跟进。");
//草稿不提醒
if(!"0".equals(xmTaskVo.getStatus())){
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), "您成为任务【" + xmTask.getName() + "】的负责人,请注意跟进。");
}
return xmTaskVo; return xmTaskVo;
} }

Loading…
Cancel
Save