diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java index c98ef989..2428e5d6 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java @@ -133,8 +133,8 @@ public class XmTaskBidOrderController { User user= LoginUtils.getCurrentUserInfo(); User userInterests=sysClient.getUserInterestsByUserid(user.getUserid()); - bidOrderVo.setExecUserBranchId(user.getBranchId()); - bidOrderVo.setUsername(user.getUsername()); + bidOrderVo.setBidBranchId(user.getBranchId()); + bidOrderVo.setBidUsername(user.getUsername()); bidOrderVo.setBranchId(xmTaskDb.getCbranchId()); bidOrderVo.setProjectId(xmTaskDb.getProjectId()); bidOrderVo.setBidDirect("1"); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java index 86ce6b59..7494c009 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java @@ -360,23 +360,23 @@ public class XmWorkloadController { Map p=map("planId",xmWorkload.getPlanId(),"caseId",xmWorkload.getCaseId()); List> xmTestPlanCaseDbs=this.xmTestPlanCaseService.selectListMapByWhere(QueryTools.initPage(p),QueryTools.initQueryWrapper(XmTestPlanCase.class,p),p); if(xmTestPlanCaseDbs==null||xmTestPlanCaseDbs.size()==0){ - return failed("xmTestPlanCaseDb-0","执行用例已不存在"); + return Result.error("xmTestPlanCaseDb-0","执行用例已不存在"); } Map xmTestPlanCaseDb=xmTestPlanCaseDbs.get(0); if(!(xmWorkload.getUserid().equals(xmTestPlanCaseDb.get("execUserid")))){ - return failed("userid-err",xmWorkload.getUserid()+"不是当前用例的执行人，无须报工。"); + return Result.error("userid-err",xmWorkload.getUserid()+"不是当前用例的执行人，无须报工。"); } String projectId= (String) xmTestPlanCaseDb.get("projectId"); if(StringUtils.hasText(projectId)){ XmProject xmProject=xmProjectService.getProjectFromCache(projectId); if(xmProject==null){ - return failed("project-0","项目已不存在"); + return Result.error("project-0","项目已不存在"); } xmWorkload.setProjectId(xmProject.getId()); xmWorkload.setBranchId(xmProject.getBranchId()); }else{ - return failed("projectId-0","项目编号不能为空"); + return Result.error("projectId-0","项目编号不能为空"); } xmWorkload.setBizName((String) xmTestPlanCaseDb.get("caseName")); xmWorkload.setCtime(new Date()); diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java index 4aaf6ef8..4d87a253 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java @@ -217,5 +217,8 @@ public class XmGroupService { public boolean checkUserIsOtherUserTeamHeadOrAss(List groups, String headUserid, String memUserid) { return true; } + + public void addGroups(String projectId, List gs) { + } } 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 60c15803..8e0ecef1 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; 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.XmTask; @@ -112,9 +113,10 @@ public class XmTaskExecuserService extends BaseService usernames=new ArrayList<>(); User user=LoginUtils.getCurrentUserInfo(); - List pgroups=groupService.getProjectGroupVoList(projectId); + + List pgroups=groupService.getSubDeptList(projectId); for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserList) { - List userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid()); + List userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid()); XmTaskExecuser xmTaskExecuser2=new XmTaskExecuser(); xmTaskExecuser2.setTaskId(xmTaskExecuser.getTaskId()); xmTaskExecuser2.setBidUserid(xmTaskExecuser.getBidUserid()); @@ -135,9 +137,9 @@ public class XmTaskExecuserService extends BaseService { xmTaskExecuser.setTaskId(xmTaskVo.getId()); xmTaskExecuser.setTaskName(xmTaskVo.getName()); xmTaskExecuser.setProjectId(xmTaskVo.getProjectId()); - xmTaskExecuser.setUserid(exeUser.getUserid()); - xmTaskExecuser.setUsername(exeUser.getUsername()); - xmTaskExecuser.setExecUserBranchId(exeUser.getBranchId()); + xmTaskExecuser.setBidUserid(exeUser.getUserid()); + xmTaskExecuser.setBidUsername(exeUser.getUsername()); + xmTaskExecuser.setBidBranchId(exeUser.getBranchId()); xmTaskExecuser.setBranchId(xmTaskVo.getCbranchId()); xmTaskExecuser.setStatus("1"); xmTaskExecuser.setQuoteAmount(svrVo.getPrice()); @@ -244,19 +245,13 @@ public class XmTaskService extends BaseService { xmTaskExecuser.setSkillRemark((String)userServiceData.get("skills")); - XmGroupVo xmGroupVo=new XmGroupVo(); - xmGroupVo.setId(groupService.createKey("id")); - XmGroupUser xmGroupUser=new XmGroupUser(); - xmGroupUser.setUserid(exeUser.getUserid()); - xmGroupUser.setUsername(exeUser.getUsername()); - xmGroupVo.setBranchId(xmTaskVo.getCbranchId()); - xmGroupVo.setAssUserid(xmTaskVo.getCreateUserid()); - xmGroupVo.setAssUsername(xmTaskVo.getCreateUsername()); - List gusers=new ArrayList<>(); - gusers.add(xmGroupUser); - xmGroupVo.setGroupUsers(gusers); - List gs=new ArrayList<>(); - gs.add(xmGroupVo); + Dept Dept=new Dept(); + Dept.setDeptid(this.xmTaskSkillService.createKey("id")); + Dept xmGroupUser=new Dept(); + + Dept.setBranchId(xmTaskVo.getCbranchId()); + List gs=new ArrayList<>(); + gs.add(Dept); groupService.addGroups(xmTaskVo.getProjectId(),gs); xmTaskExecuserService.addExecuser(xmTaskExecuser,!"0".equals(xmTaskVo.getStatus()));