From 49e99f6b1ee02c25d24c75c2adfa9cd05d7443b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 5 Dec 2022 18:33:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=95=86=E6=9C=8D=E5=8A=A1=E6=B7=BB=E5=8A=A0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/service/XmTaskService.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) 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 7bd65280..68098861 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 @@ -10,16 +10,10 @@ import com.mdp.core.utils.NumberUtil; import com.mdp.msg.client.PushNotifyMsgService; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; -import com.xm.core.entity.XmMenu; -import com.xm.core.entity.XmTask; -import com.xm.core.entity.XmTaskExecuser; -import com.xm.core.entity.XmTaskSkill; +import com.xm.core.entity.*; import com.xm.core.queue.XmTaskSumParentsPushService; import com.xm.core.service.client.SysClient; -import com.xm.core.vo.BatchRelTasksWithMenu; -import com.xm.core.vo.BatchRelTasksWithPhase; -import com.xm.core.vo.UserSvrVo; -import com.xm.core.vo.XmTaskVo; +import com.xm.core.vo.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -234,6 +228,23 @@ public class XmTaskService extends BaseService { xmTaskExecuser.setQuoteAmount(svrVo.getPrice()); xmTaskExecuser.setQuoteWorkload(xmTaskVo.getBudgetWorkload()); 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); + groupService.addGroups(xmTaskVo.getProjectId(),gs); + xmTaskExecuserService.addExecuser(xmTaskExecuser); xmTaskVo.setExeUserids(exeUser.getUserid()); xmTaskVo.setExeUsernames(exeUser.getUsername());