diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 39ef7351..8f93e62b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -277,7 +277,7 @@ public class XmTaskExecuserController { xmTaskExecuser.setStatus("1");//如果不是众包,则添加为执行人 } - xmTaskExecuserService.addExecuser(xmTaskExecuser); + xmTaskExecuserService.addExecuser(xmTaskExecuser,!"0".equals(xmTask.getStatus())); if(isBranch){ sysClient.pushBidsAfterBidSuccess(xmTaskExecuser.getExecUserBranchId(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); }else { diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index 5c21ab0f..22448374 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -47,8 +47,13 @@ public class XmTaskExecuserService extends BaseService { @Autowired PushNotifyMsgService notifyMsgService; - - public void addExecuser(XmTaskExecuser xmTaskExecuser){ + + /** + * + * @param xmTaskExecuser + * @param sendMsg 草稿不提醒 + */ + public void addExecuser(XmTaskExecuser xmTaskExecuser,boolean sendMsg){ User user = LoginUtils.getCurrentUserInfo(); XmTaskExecuser xmTaskExecuserQuery=new XmTaskExecuser(); xmTaskExecuserQuery.setTaskId(xmTaskExecuser.getTaskId()); @@ -68,18 +73,20 @@ public class XmTaskExecuserService extends BaseService { String imMsg=""; String notifyMsg=""; - updateXmTaskExeUseridsAndUsernamesByTaskId(xmTaskExecuser.getTaskId()); - if("0".equals(xmTaskExecuser.getStatus())){ - imMsg=xmTaskExecuser.getUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的候选人,待雇主选标。"; - notifyMsg="您成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的候选人,请等待雇主选标,在雇主选标前,您还可以修改报价,合理的报价更容易获得雇主的喜欢哦!"; - }else { - imMsg=xmTaskExecuser.getUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的执行人,请及时跟进任务!"; - notifyMsg="您成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的执行人,请及时跟进任务!"; - } - this.pushMsgService.pushPrichatMsgToIm(user.getBranchId(),user.getUserid(),user.getUsername(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),imMsg); - this.pushMsgService.pushCreateCssGroupMsg(user.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), imMsg); + updateXmTaskExeUseridsAndUsernamesByTaskId(xmTaskExecuser.getTaskId()); + if(sendMsg){//草稿任务不要提醒 + if("0".equals(xmTaskExecuser.getStatus())){ + imMsg=xmTaskExecuser.getUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的候选人,待雇主选标。"; + notifyMsg="您成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的候选人,请等待雇主选标,在雇主选标前,您还可以修改报价,合理的报价更容易获得雇主的喜欢哦!"; + }else { + imMsg=xmTaskExecuser.getUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的执行人,请及时跟进任务!"; + notifyMsg="您成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的执行人,请及时跟进任务!"; + } + this.pushMsgService.pushPrichatMsgToIm(user.getBranchId(),user.getUserid(),user.getUsername(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),imMsg); + this.pushMsgService.pushCreateCssGroupMsg(user.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), imMsg); notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), "2", xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), notifyMsg); + } xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-增加候选人", "任务增加候选人"+xmTaskExecuser.getUsername(),JSONObject.toJSONString(xmTaskExecuser),null); } /** diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index 68098861..a1da75ad 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -245,7 +245,7 @@ public class XmTaskService extends BaseService { gs.add(xmGroupVo); groupService.addGroups(xmTaskVo.getProjectId(),gs); - xmTaskExecuserService.addExecuser(xmTaskExecuser); + xmTaskExecuserService.addExecuser(xmTaskExecuser,!"0".equals(xmTaskVo.getStatus())); xmTaskVo.setExeUserids(exeUser.getUserid()); xmTaskVo.setExeUsernames(exeUser.getUsername()); xmTaskVo.setExecutorUserid(exeUser.getUserid());