From ba000b18188a9dbcf656ea11e93893ac199ded64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 18 Dec 2022 13:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ctrl/XmTaskExecuserController.java | 63 +++++++++++++------ .../com/xm/core/service/XmGroupService.java | 2 +- .../com/xm/core/service/XmProjectService.java | 4 +- .../com/xm/core/service/XmTaskService.java | 4 +- 4 files changed, 46 insertions(+), 27 deletions(-) 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 5aaa8d23..2ec4ddee 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 @@ -8,12 +8,9 @@ import com.mdp.core.utils.ResponseHelper; import com.mdp.meta.client.service.ItemService; import com.mdp.msg.client.PushNotifyMsgService; import com.mdp.mybatis.PageUtils; -import com.mdp.qx.HasQx; 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.entity.*; import com.xm.core.service.*; import com.xm.core.service.client.MkClient; import com.xm.core.service.client.SysClient; @@ -27,10 +24,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.mdp.core.utils.BaseUtils.map; @@ -185,7 +179,7 @@ public class XmTaskExecuserController { @ApiResponses({ @ApiResponse(code = 200,response=XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) - @HasQx(value = "xm_core_xmTaskExecuser_add",name = "新增任务执行者",moduleId = "xm-project",moduleName = "管理端-项目管理系统") + //@HasQx(value = "xm_core_xmTaskExecuser_add",name = "新增任务执行者",moduleId = "xm-project",moduleName = "管理端-项目管理系统") @RequestMapping(value="/add",method=RequestMethod.POST) public Map addXmTaskExecuser(@RequestBody XmTaskExecuser xmTaskExecuser) { Map m = new HashMap<>(); @@ -303,7 +297,7 @@ public class XmTaskExecuserController { @ApiResponses({ @ApiResponse(code = 200,response=XmTaskExecuser.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) - @HasQx(value = "xm_core_xmTaskExecuser_leave",name = "执行人离开任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统") + //@HasQx(value = "xm_core_xmTaskExecuser_leave",name = "执行人离开任务",moduleId = "xm-project",moduleName = "管理端-项目管理系统") @RequestMapping(value="/leave",method=RequestMethod.POST) public Map leave(@RequestBody List xmTaskExecusers) { Map m = new HashMap<>(); @@ -386,7 +380,7 @@ public class XmTaskExecuserController { @ApiResponses({ @ApiResponse(code = 200,response=XmTaskExecuser.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) - @HasQx(value = "xm_core_xmTaskExecuser_execute",name = "修改任务执行人基础信息",moduleId = "xm-project",moduleName = "管理端-项目管理系统") + //@HasQx(value = "xm_core_xmTaskExecuser_execute",name = "修改任务执行人基础信息",moduleId = "xm-project",moduleName = "管理端-项目管理系统") @RequestMapping(value="/execute",method=RequestMethod.POST) public Map execute(@RequestBody XmTaskExecuser xmTaskExecuser) { Map m = new HashMap<>(); @@ -425,14 +419,43 @@ public class XmTaskExecuserController { if(tips.isOk()) { boolean exists=groupService.checkUserExistsGroup(pgroups, xmTaskExecuser.getUserid()); - - if(exists) { - + //如果还未加入项目组，自动加入项目组 + if(!exists) { + if(pgroups!=null && pgroups.size()>0){ + XmGroupVo xg=pgroups.get(0); + XmGroupUser xmGroupUser=new XmGroupUser(); + xmGroupUser.setGroupId(xg.getId()); + xmGroupUser.setUsername(xmTaskExecuser.getUsername()); + xmGroupUser.setUserid(xmTaskExecuser.getUserid()); + xmGroupUser.setJoinTime(new Date()); + xmGroupUser.setStatus("1"); + xmGroupUser.setIsPri("1"); + xmGroupUser.setObranchId(xmTaskExecuser.getExecUserBranchId()); + this.xmGroupUserService.insert(xmGroupUser); + groupService.clearProjectGroup(projectId); + }else{ + XmGroupVo xmGroupVo=new XmGroupVo(); + xmGroupVo.setProjectId(projectId); + xmGroupVo.setAssUsername(user.getUsername()); + xmGroupVo.setAssUserid(user.getUserid()); + xmGroupVo.setBranchId(user.getBranchId()); + xmGroupVo.setChildrenCnt(1); + xmGroupVo.setCtime(new Date()); + xmGroupVo.setGroupName("默认管理小组"); + XmGroupUser xmGroupUser=new XmGroupUser(); + xmGroupUser.setUsername(xmTaskExecuser.getUsername()); + xmGroupUser.setUserid(xmTaskExecuser.getUserid()); + xmGroupUser.setJoinTime(new Date()); + xmGroupUser.setStatus("1"); + xmGroupUser.setIsPri("1"); + xmGroupUser.setObranchId(xmTaskExecuser.getExecUserBranchId()); + xmGroupVo.setGroupUsers(Arrays.asList(xmGroupUser)); + groupService.addGroups(projectId,Arrays.asList(xmGroupVo)); + } //一个任务只能一个执行人 xmTaskExecuserService.becomeExecute(xmTask,xmTaskExecuser); - } - if(!exists) { - tips.setFailureMsg("变更不成功，原因：候选人不在项目组中，请先将候选人加入项目团队中。"); + tips.setOkMsg("变更成功"); + //tips.setFailureMsg("变更不成功，原因：候选人不在项目组中，请先将候选人加入项目团队中。"); }else { tips.setOkMsg("变更成功"); } @@ -455,7 +478,7 @@ public class XmTaskExecuserController { @ApiResponses({ @ApiResponse(code = 200,response=XmTaskExecuser.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) - @HasQx(value = "xm_core_xmTaskExecuser_quotePrice",name = "项目中的任务报价",moduleId = "xm-project",moduleName = "管理端-项目管理系统") + //@HasQx(value = "xm_core_xmTaskExecuser_quotePrice",name = "项目中的任务报价",moduleId = "xm-project",moduleName = "管理端-项目管理系统") @RequestMapping(value="/quotePrice",method=RequestMethod.POST) public Map quotePrice(@RequestBody XmTaskExecuser xmTaskExecuser) { Map m = new HashMap<>(); @@ -513,7 +536,7 @@ public class XmTaskExecuserController { @ApiResponses({ @ApiResponse(code = 200,response=XmTaskExecuser.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) - @HasQx(value = "xm_core_xmTaskExecuser_candidate",name = "变更成为任务候选人",moduleId = "xm-project",moduleName = "管理端-项目管理系统") + //@HasQx(value = "xm_core_xmTaskExecuser_candidate",name = "变更成为任务候选人",moduleId = "xm-project",moduleName = "管理端-项目管理系统") @RequestMapping(value="/candidate",method=RequestMethod.POST) public Map becomeCandidate(@RequestBody XmTaskExecuser xmTaskExecuser) { Map m = new HashMap<>(); @@ -566,7 +589,7 @@ public class XmTaskExecuserController { @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") }) - @HasQx(value = "xm_core_xmTaskExecuser_del",name = "删除项目中任务的执行人",moduleId = "xm-project",moduleName = "管理端-项目管理系统") + //@HasQx(value = "xm_core_xmTaskExecuser_del",name = "删除项目中任务的执行人",moduleId = "xm-project",moduleName = "管理端-项目管理系统") @RequestMapping(value="/del",method=RequestMethod.POST) public Map delXmTaskExecuser(@RequestBody XmTaskExecuser xmTaskExecuser){ Map m = new HashMap<>(); 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 67ed0b42..ae6e1f3f 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 @@ -178,7 +178,7 @@ public class XmGroupService extends BaseService { * @param xmGroupVoList */ @Transactional - public void addGroups(String projectId,List xmGroupVoList) { + public void addGroups(String projectId,List xmGroupVoList) { List groups=new ArrayList<>(); List groupUsers=new ArrayList<>(); for (XmGroupVo xmGroupVo : xmGroupVoList) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index 21dedd8b..e851e1fd 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -46,9 +46,7 @@ public class XmProjectService extends BaseService { @Autowired XmFileService xmFileService; - - @Autowired - XmExchangeService xmExchangeService; + @Autowired XmRecordService xmRecordService; 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 527a4605..0a1f59cb 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 @@ -39,9 +39,7 @@ public class XmTaskService extends BaseService { @Autowired XmAttachmentService xmAttachmentService; - - @Autowired - XmExchangeService xmExchangeService; + @Autowired XmRecordService xmRecordService;