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 f99fda06..efdae435 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
@@ -5,18 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.err.BizException;
import com.mdp.core.service.BaseService;
-import com.mdp.core.utils.ObjectTools;
import com.mdp.msg.client.PushNotifyMsgService;
-import com.mdp.safe.client.entity.Dept;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
-import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmTask;
import com.xm.core.entity.XmTaskExecuser;
import com.xm.core.mapper.XmTaskExecuserMapper;
import com.xm.core.service.client.MkClient;
-import com.xm.core.service.client.SysClient;
import com.xm.core.service.push.XmPushMsgService;
+import com.xm.core.vo.XmGroupVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -25,9 +22,9 @@ import java.math.BigDecimal;
import java.util.*;
/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
+ * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmTaskExecuser 表 XM.xm_task_execuser 当前主键(包括多主键): id;
+ * 实体 XmTaskExecuser 表 XM.xm_task_execuser 当前主键(包括多主键): id;
***/
@Service("xm.core.xmTaskExecuserService")
public class XmTaskExecuserService extends BaseService {
@@ -36,40 +33,25 @@ public class XmTaskExecuserService extends BaseService> selectListMapByWhere(IPage page, QueryWrapper ew, Map ext){
- return baseMapper.selectListMapByWhere(page,ew,ext);
- }
+
/**
*
@@ -80,7 +62,7 @@ public class XmTaskExecuserService extends BaseService userDb=this.selectListByWhere(xmTaskExecuserQuery);
if(userDb.size()>0) {
throw new BizException(xmTaskExecuser.getBidUsername()+"已在任务中，不允许再添加");
@@ -107,7 +89,7 @@ public class XmTaskExecuserService extends BaseService xmTaskExecuserList){
+ public void batchLeave(List xmTaskExecuserList){
String projectId=xmTaskExecuserList.get(0).getProjectId();
String taskId="";
List usernames=new ArrayList<>();
-
- User user=LoginUtils.getCurrentUserInfo();
- List pgroups=groupService.getSubDeptList(projectId);
- for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserList) {
- List userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid());
+ User user=LoginUtils.getCurrentUserInfo();
+ List pgroups=groupService.getProjectGroupVoList(projectId);
+ for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserList) {
+ List userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid());
XmTaskExecuser xmTaskExecuser2=new XmTaskExecuser();
xmTaskExecuser2.setTaskId(xmTaskExecuser.getTaskId());
- xmTaskExecuser2.setBidUserid(xmTaskExecuser.getBidUserid());
+ xmTaskExecuser2.setPrjUserid(xmTaskExecuser.getBidUserid());
xmTaskExecuser2.setStatus("7");
this.updateSomeFieldByPk(xmTaskExecuser2);
projectId=xmTaskExecuser.getProjectId();
- taskId=xmTaskExecuser.getTaskId();
+ taskId=xmTaskExecuser.getTaskId();
usernames.add(xmTaskExecuser.getBidUsername());
-
+
/**
* 下面为推送任务执行人变更im通知消息
*/
@@ -144,24 +125,24 @@ public class XmTaskExecuserService extends BaseService pgroups=groupService.getProjectGroupVoList(projectId);
+ User user=LoginUtils.getCurrentUserInfo();
+
+ List userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid());
+ XmTaskExecuser query=new XmTaskExecuser();
+ query.setTaskId(taskId);
XmTaskExecuser xmTaskExecuserDb=null;
- List xmTaskExecusersDb=this.selectListByWhere(query);
- if(xmTaskExecusersDb !=null && xmTaskExecusersDb.size()>0) {
- for (XmTaskExecuser exe : xmTaskExecusersDb) {
+ List xmTaskExecusersDb=this.selectListByWhere(query);
+ if(xmTaskExecusersDb !=null && xmTaskExecusersDb.size()>0) {
+ for (XmTaskExecuser exe : xmTaskExecusersDb) {
if(!xmTaskExecuser.getBidUserid().equals(exe.getBidUserid())) {
if(!"0".equals(exe.getStatus()) && !"7".equals(exe.getStatus())) {
throw new BizException(exe.getBidUsername()+"是当前执行人，不允许再添加其它执行人");
@@ -188,74 +173,61 @@ public class XmTaskExecuserService extends BaseService0){
mkClient.pushAfterTaskExecSuccess(xmTaskExecuserDb.getBidUserid(),xmTaskExecuserDb.getBidUsername(),xmTaskDb.getProjectId(),xmTaskDb.getId(),xmTaskDb.getShareFee());
}
- xmRecordService.addXmTaskRecord(projectId, taskId, "项目-任务-变更为执行人", xmTaskExecuser.getBidUsername()+"变更为任务执行人",null,null);
+ xmRecordService.addXmTaskRecord(projectId, taskId, "项目-任务-变更为执行人", xmTaskExecuser.getBidUsername()+"变更为任务执行人",null,null);
}
-
-
-
+
+
+
public void becomeCandidate(XmTaskExecuser xmTaskExecuser) {
XmTaskExecuser xmTaskExecuserNew=new XmTaskExecuser();
xmTaskExecuserNew.setTaskId(xmTaskExecuser.getTaskId());
- xmTaskExecuserNew.setBidUsername(xmTaskExecuser.getBidUsername());
xmTaskExecuserNew.setBidUserid(xmTaskExecuser.getBidUserid());
- xmTaskExecuserNew.setQuoteWeekday(xmTaskExecuser.getQuoteWeekday());
+ xmTaskExecuserNew.setQuoteWeekday(xmTaskExecuser.getQuoteWeekday());
xmTaskExecuserNew.setQuoteWorkload(xmTaskExecuser.getQuoteWorkload());
xmTaskExecuserNew.setQuoteAmount(xmTaskExecuser.getQuoteAmount());
xmTaskExecuserNew.setQuoteEndTime(xmTaskExecuser.getQuoteEndTime());
xmTaskExecuserNew.setQuoteStartTime(xmTaskExecuser.getQuoteStartTime());
- xmTaskExecuserNew.setSkillRemark(xmTaskExecuser.getSkillRemark());
+ xmTaskExecuserNew.setSkillRemark(xmTaskExecuser.getSkillRemark());
xmTaskExecuserNew.setStatus("0");
- this.updateById(xmTaskExecuserNew,true);
+ this.updateSomeFieldByPk(xmTaskExecuserNew);
updateXmTaskExeUseridsAndUsernamesByTaskId(xmTaskExecuser.getTaskId());
this.pushMsgService.pushCssMsg(xmTaskExecuser.getBranchId(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), xmTaskExecuser.getBidUsername()+"变更为候选人并提交关于任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】报价信息");
User user=LoginUtils.getCurrentUserInfo();
- notifyMsgService.pushMsg(user, xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), "您成为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskExecuser.getTaskName() + "】的候选人，请等待雇主选标，在雇主选标前，您还可以修改报价，合理的报价更容易获得雇主的喜欢哦！",null);
+ notifyMsgService.pushMsg(user.getBranchId(),user.getUserid(),user.getUsername(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), "您成为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskExecuser.getTaskName() + "】的候选人，请等待雇主选标，在雇主选标前，您还可以修改报价，合理的报价更容易获得雇主的喜欢哦！",null);
xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-候选人报价", xmTaskExecuser.getBidUsername()+"变更为候选人并提交报价信息",JSONObject.toJSONString(xmTaskExecuser),null);
}
@@ -268,11 +240,11 @@ public class XmTaskExecuserService extends BaseService> selectListMapByWhereWithTask(IPage page, QueryWrapper ew, Map ext){
- return baseMapper.selectListMapByWhereWithTask(page,ew,ext);
+ public List> selectListMapByWhereWithTask(IPage page, QueryWrapper qw, Map ext){
+ return baseMapper.selectListMapByWhereWithTask(page,qw,ext);
}
}