end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
d457a854fe
commit
317b5e3eb5
15 changed files with 167 additions and 289 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
  2. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
  3. 50
      xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java
  4. 6
      xm-core/src/main/java/com/xm/core/entity/XmGroup.java
  5. 6
      xm-core/src/main/java/com/xm/core/entity/XmGroupState.java
  6. 6
      xm-core/src/main/java/com/xm/core/entity/XmGroupUser.java
  7. 122
      xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java
  8. 114
      xm-core/src/main/java/com/xm/core/service/XmGroupService.java
  9. 8
      xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
  10. 14
      xm-core/src/main/java/com/xm/core/service/XmProductService.java
  11. 14
      xm-core/src/main/java/com/xm/core/service/XmProjectService.java
  12. 12
      xm-core/src/main/java/com/xm/core/vo/XmGroupVo.java
  13. 20
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
  14. 18
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupStateMapper.xml
  15. 26
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml

36
xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
View File

@ -8,9 +8,9 @@ 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.XmGroup;
import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmProjectGroup;
import com.xm.core.service.XmProductService;
import com.xm.core.service.XmGroupService;
import com.xm.core.service.XmProjectService;
@ -71,11 +71,11 @@ public class XmGroupController {
@ApiOperation( value = "删除旧团队，新增新团队",notes="")
@ApiResponses({
@ApiResponse(code = 200,response= XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@HasQx(value = "xm_core_xmProjectGroup_updateGroup",name = "批量更新修改项目团队信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/edit",method=RequestMethod.POST)
public Map<String,Object> updateGroup(@RequestBody XmProjectGroup group) {
public Map<String,Object> updateGroup(@RequestBody XmGroup group) {
Tips tips=new Tips("小组更新成功");
Map<String,Object> m = new HashMap<>();
@ -88,7 +88,7 @@ public class XmGroupController {
return ResponseHelper.failed("id-0","小组编号不能为空");
}
User user=LoginUtils.getCurrentUserInfo();
XmProjectGroup groupDb=this.xmProjectGroupService.selectOneObject(new XmProjectGroup(group.getId()));
XmGroup groupDb=this.xmProjectGroupService.selectOneObject(new XmGroup(group.getId()));
if(groupDb==null){
return ResponseHelper.failed("data-0","小组已不存在。");
}
@ -141,7 +141,7 @@ public class XmGroupController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@HasQx(value = "xm_core_xmProjectGroup_getGroups",name = "查找项目团队信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/getGroups",method=RequestMethod.GET)
@ -184,7 +184,7 @@ public class XmGroupController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
@ApiResponse(code = 200,response= XmGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map<String,Object> listXmProjectGroup( @RequestParam Map<String,Object> xmProjectGroup){
@ -209,11 +209,11 @@ public class XmGroupController {
@ApiOperation( value = "新增一条xm_group信息",notes="addXmProjectGroup,主键如果为空，后台自动生成")
@ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@HasQx(value = "xm_core_xmProjectGroup_add",name = "新增项目团队信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/add",method=RequestMethod.POST)
public Map<String,Object> addXmProjectGroup(@RequestBody XmProjectGroup xmProjectGroup) {
public Map<String,Object> addXmProjectGroup(@RequestBody XmGroup xmProjectGroup) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功新增一条数据");
try{
@ -261,7 +261,7 @@ public class XmGroupController {
if (StringUtils.isEmpty(xmProjectGroup.getId())) {
xmProjectGroup.setId(xmProjectGroupService.createKey("id"));
} else {
XmProjectGroup xmProjectGroupQuery = new XmProjectGroup(xmProjectGroup.getId());
XmGroup xmProjectGroupQuery = new XmGroup(xmProjectGroup.getId());
if (xmProjectGroupService.countByWhere(xmProjectGroupQuery) > 0) {
tips.setFailureMsg("编号重复，请修改编号再提交");
m.put("tips", tips);
@ -298,7 +298,7 @@ public class XmGroupController {
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
})
@RequestMapping(value="/del",method=RequestMethod.POST)
public Map<String,Object> delXmProjectGroup(@RequestBody XmProjectGroup xmProjectGroup){
public Map<String,Object> delXmProjectGroup(@RequestBody XmGroup xmProjectGroup){
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除一条数据");
try{
@ -306,7 +306,7 @@ public class XmGroupController {
if(!StringUtils.hasText(xmProjectGroup.getId())){
return ResponseHelper.failed("id-0","请上送小组编号");
}
XmProjectGroup groupDb=this.xmProjectGroupService.selectOneObject(xmProjectGroup);
XmGroup groupDb=this.xmProjectGroupService.selectOneObject(xmProjectGroup);
if(groupDb==null){
return ResponseHelper.failed("data-0","小组已不存在");
}
@ -368,22 +368,22 @@ public class XmGroupController {
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
@RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Map<String,Object> batchDelXmProjectGroup(@RequestBody List<XmProjectGroup> xmProjectGroups) {
public Map<String,Object> batchDelXmProjectGroup(@RequestBody List<XmGroup> xmProjectGroups) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除"+xmProjectGroups.size()+"条数据");
try{
List<XmProjectGroup> groupsDb=this.xmProjectGroupService.selectListByIds(xmProjectGroups.stream().map(i->i.getId()).collect(Collectors.toList()));
List<XmGroup> groupsDb=this.xmProjectGroupService.selectListByIds(xmProjectGroups.stream().map(i->i.getId()).collect(Collectors.toList()));
if(groupsDb==null || groupsDb.size()==0){
return ResponseHelper.failed("data-0","要删除的小组已不存在");
}
User user=LoginUtils.getCurrentUserInfo();
XmProjectGroup groupDb=groupsDb.get(0);
XmGroup groupDb=groupsDb.get(0);
String pgClass=groupDb.getPgClass();
String id=groupDb.getProductId();
List<XmProjectGroup> hasChildNodes=new ArrayList<>();
List<XmProjectGroup> noQxs=new ArrayList<>();
List<XmProjectGroup> canDelNodes=new ArrayList<>();
List<XmGroup> hasChildNodes=new ArrayList<>();
List<XmGroup> noQxs=new ArrayList<>();
List<XmGroup> canDelNodes=new ArrayList<>();
if("0".equals(pgClass)){
id=groupDb.getProjectId();
XmProject prject=this.xmProjectService.getProjectFromCache(id);
@ -400,7 +400,7 @@ public class XmGroupController {
}
}
if(canDelNodes.size()>0){
for (XmProjectGroup canDelNode : canDelNodes) {
for (XmGroup canDelNode : canDelNodes) {
if(!xmProjectGroupService.checkCanDelAllChild(canDelNode,canDelNodes)){
hasChildNodes.add(canDelNode);
}else{

4
xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
View File

@ -4,7 +4,7 @@ import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.utils.RequestUtils;
import com.mdp.mybatis.PageUtils;
import com.xm.core.entity.XmProjectGroupState;
import com.xm.core.entity.XmGroupState;
import com.xm.core.service.XmGroupStateService;
import io.swagger.annotations.*;
import org.apache.commons.logging.Log;
@ -85,7 +85,7 @@ public class XmGroupStateController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
@ApiResponse(code = 200,response= XmProjectGroupState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
@ApiResponse(code = 200,response= XmGroupState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map<String,Object> listXmProjectGroupState( @RequestParam Map<String,Object> xmProjectGroupState){

50
xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java
View File

@ -9,7 +9,7 @@ import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmProjectGroupUser;
import com.xm.core.entity.XmGroupUser;
import com.xm.core.service.*;
import com.xm.core.service.push.XmPushMsgService;
import com.xm.core.vo.XmGroupVo;
@ -85,7 +85,7 @@ public class XmGroupUserController {
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
@ApiResponse(code = 200,response= XmProjectGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
@ApiResponse(code = 200,response= XmGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map<String,Object> listXmProjectGroupUser( @RequestParam Map<String,Object> xmProjectGroupUser){
@ -104,10 +104,10 @@ public class XmGroupUserController {
@ApiOperation( value = "新增一条xm_group_user信息",notes="addXmProjectGroupUser,主键如果为空，后台自动生成")
@ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/add",method=RequestMethod.POST)
public Map<String,Object> addXmProjectGroupUser(@RequestBody XmProjectGroupUser gu) {
public Map<String,Object> addXmProjectGroupUser(@RequestBody XmGroupUser gu) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功新增一条数据");
try{
@ -197,7 +197,7 @@ public class XmGroupUserController {
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
})
@RequestMapping(value="/del",method=RequestMethod.POST)
public Map<String,Object> delXmProjectGroupUser(@RequestBody XmProjectGroupUser gu){
public Map<String,Object> delXmProjectGroupUser(@RequestBody XmGroupUser gu){
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除一条数据");
try{
@ -279,17 +279,17 @@ public class XmGroupUserController {
@ApiOperation( value = "根据主键修改一条xm_group_user信息",notes="editXmProjectGroupUser")
@ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroupUser.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
@ApiResponse(code = 200,response= XmGroupUser.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/edit",method=RequestMethod.POST)
public Map<String,Object> editXmProjectGroupUser(@RequestBody XmProjectGroupUser gu0) {
public Map<String,Object> editXmProjectGroupUser(@RequestBody XmGroupUser gu0) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功更新一条数据");
try{
if(!StringUtils.hasText(gu0.getGroupId())||!StringUtils.hasText(gu0.getUserid())){
return ResponseHelper.failed("pk-0","请上送小组编号，用户编号groupId,userid");
}
XmProjectGroupUser gu=this.xmProjectGroupUserService.selectOneObject(gu0);
XmGroupUser gu=this.xmProjectGroupUserService.selectOneObject(gu0);
if(gu==null){
return ResponseHelper.failed("data-0","小组已不存在");
}
@ -364,7 +364,7 @@ public class XmGroupUserController {
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
@RequestMapping(value="/batchAdd",method=RequestMethod.POST)
public Map<String,Object> batchAddXmProjectGroupUser(@RequestBody List<XmProjectGroupUser> gus) {
public Map<String,Object> batchAddXmProjectGroupUser(@RequestBody List<XmGroupUser> gus) {
Map<String,Object> m = new HashMap<>();
if(gus==null || gus.size()==0){
return ResponseHelper.failed("data-0","请上送要删除的小组成员");
@ -374,7 +374,7 @@ public class XmGroupUserController {
if(gus.stream().filter(i->!StringUtils.hasText(i.getUserid())||!StringUtils.hasText(i.getGroupId())).findAny().isPresent()){
return ResponseHelper.failed("userid-or-groupId-0","请上送用户编号及小组编号");
}else{
for (XmProjectGroupUser gu : gus) {
for (XmGroupUser gu : gus) {
if(!"1".equals(gu.getPgClass())&&!StringUtils.hasText(gu.getProjectId())){
return ResponseHelper.failed("projectId-0","项目编号不能为空");
}else if("1".equals(gu.getPgClass())&&!StringUtils.hasText(gu.getProductId()))
@ -382,18 +382,18 @@ public class XmGroupUserController {
}
}
List<XmProjectGroupUser> gusDb=this.xmProjectGroupUserService.selectListByIds(gus);
List<XmGroupUser> gusDb=this.xmProjectGroupUserService.selectListByIds(gus);
//过滤掉已经存在的
List<XmProjectGroupUser> gusNoExists=gus.stream().filter(i->!(gusDb.stream().filter(k->k.getGroupId().equals(i.getGroupId())&&k.getUserid().equals(i.getUserid()))).findAny().isPresent()).collect(Collectors.toList());
List<XmGroupUser> gusNoExists=gus.stream().filter(i->!(gusDb.stream().filter(k->k.getGroupId().equals(i.getGroupId())&&k.getUserid().equals(i.getUserid()))).findAny().isPresent()).collect(Collectors.toList());
if(gusNoExists.size()==0){
return ResponseHelper.failed("user-had-exists","成功添加0个组员。以下用户已在小组中，不用再添加。【"+gusDb.stream().map(i->i.getUsername()).collect(Collectors.joining(","))+"】");
}
User user=LoginUtils.getCurrentUserInfo();
XmProjectGroupUser gu=gusNoExists.get(0);
XmGroupUser gu=gusNoExists.get(0);
String productId=gu.getProductId();
String projectId=gu.getProjectId();
String pgClass=gu.getPgClass();
List<XmProjectGroupUser> gus2=new ArrayList<>();
List<XmGroupUser> gus2=new ArrayList<>();
XmProduct xmProduct=null;
XmProject xmProject=null;
if("1".equals(pgClass)){
@ -417,8 +417,8 @@ public class XmGroupUserController {
}
Set<String> groupIds=gusNoExists.stream().map(i->i.getGroupId()).collect(Collectors.toSet());
List<XmProjectGroupUser> canAddUsers=new ArrayList<>();
Map<String,List<XmProjectGroupUser>> groupUsersMap=new HashMap<>();
List<XmGroupUser> canAddUsers=new ArrayList<>();
Map<String,List<XmGroupUser>> groupUsersMap=new HashMap<>();
for (String groupId : groupIds) {
if("1".equals(pgClass)){
boolean isPm=xmProjectGroupService.checkUserIsProductAdm(xmProduct,user.getUserid());
@ -445,7 +445,7 @@ public class XmGroupUserController {
}
}
}
List<XmProjectGroupUser> cdus=gus2.stream().filter(i->groupId.equals(i.getGroupId())).collect(Collectors.toList());
List<XmGroupUser> cdus=gus2.stream().filter(i->groupId.equals(i.getGroupId())).collect(Collectors.toList());
canAddUsers.addAll(cdus);
groupUsersMap.put(groupId,cdus);
}
@ -494,23 +494,23 @@ public class XmGroupUserController {
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
@RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Map<String,Object> batchDelXmProjectGroupUser(@RequestBody List<XmProjectGroupUser> gus) {
public Map<String,Object> batchDelXmProjectGroupUser(@RequestBody List<XmGroupUser> gus) {
Map<String,Object> m = new HashMap<>();
if(gus==null || gus.size()==0){
return ResponseHelper.failed("data-0","请上送要删除的小组成员");
}
Tips tips=new Tips("成功删除"+gus.size()+"条数据");
try{
List<XmProjectGroupUser> gusDb=this.xmProjectGroupUserService.selectListByIds(gus);
List<XmGroupUser> gusDb=this.xmProjectGroupUserService.selectListByIds(gus);
if(gusDb.size()==0){
return ResponseHelper.failed("data-0","要删除的数据已不存在。");
}
User user=LoginUtils.getCurrentUserInfo();
XmProjectGroupUser gu=gusDb.get(0);
XmGroupUser gu=gusDb.get(0);
String productId=gu.getProductId();
String projectId=gu.getProjectId();
String pgClass=gu.getPgClass();
List<XmProjectGroupUser> gus2=new ArrayList<>();
List<XmGroupUser> gus2=new ArrayList<>();
XmProduct xmProduct=null;
XmProject xmProject=null;
if("1".equals(pgClass)){
@ -534,8 +534,8 @@ public class XmGroupUserController {
}
Set<String> groupIds=gusDb.stream().map(i->i.getGroupId()).collect(Collectors.toSet());
List<XmProjectGroupUser> canDelUsers=new ArrayList<>();
Map<String,List<XmProjectGroupUser>> groupUsersMap=new HashMap<>();
List<XmGroupUser> canDelUsers=new ArrayList<>();
Map<String,List<XmGroupUser>> groupUsersMap=new HashMap<>();
for (String groupId : groupIds) {
if("1".equals(pgClass)){
boolean isPm=xmProjectGroupService.checkUserIsProductAdm(xmProduct,user.getUserid());
@ -562,7 +562,7 @@ public class XmGroupUserController {
}
}
}
List<XmProjectGroupUser> cdus=gus2.stream().filter(i->groupId.equals(i.getGroupId())).collect(Collectors.toList());
List<XmGroupUser> cdus=gus2.stream().filter(i->groupId.equals(i.getGroupId())).collect(Collectors.toList());
canDelUsers.addAll(cdus);
groupUsersMap.put(groupId,cdus);
}
@ -574,7 +574,7 @@ public class XmGroupUserController {
List<String> noDelUsers=new ArrayList<>();
if(canDelUsers.size()<gus.size()){
for (XmProjectGroupUser gu0 : gus) {
for (XmGroupUser gu0 : gus) {
if(!canDelUsers.stream().filter(i->i.getUserid().equals(gu0.getUserid())&&i.getGroupId().equals(gu0.getGroupId())).findAny().isPresent()){
noDelUsers.add(gu0.getUsername());
}

xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java → xm-core/src/main/java/com/xm/core/entity/XmGroup.java
View File

xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java → xm-core/src/main/java/com/xm/core/entity/XmGroupState.java
View File

xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java → xm-core/src/main/java/com/xm/core/entity/XmGroupUser.java
View File

122
xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java
View File

@ -1,122 +0,0 @@
package com.xm.core.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 实体 XmProjectGroupFormwork所有属性名: <br>
* id,branchId,groupName,isPub,pgTypeId,pgTypeName;<br>
* 表 XM.xm_group_formwork xm_group_formwork的所有字段名: <br>
* id,branch_id,group_name,is_pub,pg_type_id,pg_type_name;<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ApiModel(description="xm_group_formwork")
public class XmProjectGroupFormwork implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(notes="主键,主键",allowEmptyValue=true,example="",allowableValues="")
String id;
@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
String branchId;
@ApiModelProperty(notes="团队名称",allowEmptyValue=true,example="",allowableValues="")
String groupName;
@ApiModelProperty(notes="是否公共，0为否，1为是",allowEmptyValue=true,example="",allowableValues="")
String isPub;
@ApiModelProperty(notes="团队类型编号",allowEmptyValue=true,example="",allowableValues="")
String pgTypeId;
@ApiModelProperty(notes="团队类型名称",allowEmptyValue=true,example="",allowableValues="")
String pgTypeName;
/**主键**/
public XmProjectGroupFormwork(String id) {
this.id = id;
}
/**xm_group_formwork**/
public XmProjectGroupFormwork() {
}
/**
* 主键
**/
public void setId(String id) {
this.id = id;
}
/**
* 机构编号
**/
public void setBranchId(String branchId) {
this.branchId = branchId;
}
/**
* 团队名称
**/
public void setGroupName(String groupName) {
this.groupName = groupName;
}
/**
* 是否公共，0为否，1为是
**/
public void setIsPub(String isPub) {
this.isPub = isPub;
}
/**
* 团队类型编号
**/
public void setPgTypeId(String pgTypeId) {
this.pgTypeId = pgTypeId;
}
/**
* 团队类型名称
**/
public void setPgTypeName(String pgTypeName) {
this.pgTypeName = pgTypeName;
}
/**
* 主键
**/
public String getId() {
return this.id;
}
/**
* 机构编号
**/
public String getBranchId() {
return this.branchId;
}
/**
* 团队名称
**/
public String getGroupName() {
return this.groupName;
}
/**
* 是否公共，0为否，1为是
**/
public String getIsPub() {
return this.isPub;
}
/**
* 团队类型编号
**/
public String getPgTypeId() {
return this.pgTypeId;
}
/**
* 团队类型名称
**/
public String getPgTypeName() {
return this.pgTypeName;
}
}

114
xm-core/src/main/java/com/xm/core/service/XmGroupService.java
View File

@ -127,14 +127,14 @@ public class XmGroupService extends BaseService {
List<XmGroupVo> groupVoList2 = groupCacheService.getProjectGroups(projectId);
if(groupVoList2==null||groupVoList2.size()==0) {
XmProjectGroup group = new XmProjectGroup();
XmGroup group = new XmGroup();
group.setProjectId(projectId);
List<XmProjectGroup> groupList = this.selectListByWhere(group);
List<XmGroup> groupList = this.selectListByWhere(group);
if(groupList==null || groupList.size()==0) {
groupCacheService.putProjectGroups(projectId, groupVoList);
return groupVoList;
}
List<XmProjectGroupUser> groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProjectId(projectId);
List<XmGroupUser> groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProjectId(projectId);
if(groupUserList==null || groupUserList.size()==0) {
//groupCacheService.putProjectGroups(projectId, groupVoList);
//return groupVoList;
@ -142,7 +142,7 @@ public class XmGroupService extends BaseService {
groupList.forEach(g -> {
XmGroupVo gvo = new XmGroupVo();
BeanUtils.copyProperties(g,gvo);
List<XmProjectGroupUser> groupUsers=new ArrayList<>();
List<XmGroupUser> groupUsers=new ArrayList<>();
groupUserList.forEach(gu -> {
if(g.getId().equals(gu.getGroupId())) {
groupUsers.add(gu);
@ -207,20 +207,20 @@ public class XmGroupService extends BaseService {
List<XmGroupVo> groupVoList2 = groupCacheService.getProductGroups(productId);
if(groupVoList2==null||groupVoList2.size()==0) {
XmProjectGroup group = new XmProjectGroup();
XmGroup group = new XmGroup();
group.setProductId(productId);
List<XmProjectGroup> groupList = this.selectListByWhere(group);
List<XmGroup> groupList = this.selectListByWhere(group);
if(groupList==null || groupList.size()==0) {
groupCacheService.putProductGroups(productId, groupVoList);
return groupVoList;
}
List<XmProjectGroupUser> groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProductId(productId);
List<XmGroupUser> groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProductId(productId);
if(groupUserList==null || groupUserList.size()==0) {
}
groupList.forEach(g -> {
XmGroupVo gvo = new XmGroupVo();
BeanUtils.copyProperties(g,gvo);
List<XmProjectGroupUser> groupUsers=new ArrayList<>();
List<XmGroupUser> groupUsers=new ArrayList<>();
groupUserList.forEach(gu -> {
if(g.getId().equals(gu.getGroupId())) {
groupUsers.add(gu);
@ -243,18 +243,18 @@ public class XmGroupService extends BaseService {
*/
@Transactional
public void addGroups(String projectId,List<XmGroupVo> xmProjectGroupVoList) {
List<XmProjectGroup> groups=new ArrayList<>();
List<XmProjectGroupUser> groupUsers=new ArrayList<>();
List<XmGroup> groups=new ArrayList<>();
List<XmGroupUser> groupUsers=new ArrayList<>();
for (XmGroupVo xmProjectGroupVo : xmProjectGroupVoList) {
XmProjectGroup group=new XmProjectGroup();
XmGroup group=new XmGroup();
xmProjectGroupVo.setId(this.createKey("id"));
BeanUtils.copyProperties(xmProjectGroupVo, group);
groups.add(group);
List<XmProjectGroupUser> groupUsersTemp=xmProjectGroupVo.getGroupUsers();
List<XmGroupUser> groupUsersTemp=xmProjectGroupVo.getGroupUsers();
if(groupUsersTemp==null || groupUsersTemp.size()==0) {
continue;
}else {
for (XmProjectGroupUser xmProjectGroupUser : groupUsersTemp) {
for (XmGroupUser xmProjectGroupUser : groupUsersTemp) {
xmProjectGroupUser.setGroupId(group.getId());
xmProjectGroupUser.setJoinTime(new Date());
xmProjectGroupUser.setStatus("0");
@ -268,9 +268,9 @@ public class XmGroupService extends BaseService {
User u=LoginUtils.getCurrentUserInfo();
for (XmGroupVo group : xmProjectGroupVoList) {
List<XmProjectGroupUser> users=group.getGroupUsers();
List<XmGroupUser> users=group.getGroupUsers();
List<Map<String,Object>> umaps=new ArrayList<>();
for (XmProjectGroupUser xmProjectGroupUser : users) {
for (XmGroupUser xmProjectGroupUser : users) {
Map<String,Object> u2=new HashMap<>();
u2.put("userid", xmProjectGroupUser.getUserid());
u2.put("username", xmProjectGroupUser.getUsername());
@ -301,7 +301,7 @@ public class XmGroupService extends BaseService {
* 4.项目管理者、创建人可以调整小组组长
*/
@Transactional
public Tips updateGroup(XmProjectGroup group,XmProjectGroup groupDb) {
public Tips updateGroup(XmGroup group, XmGroup groupDb) {
Tips tips=new Tips("成功");
super.updateSomeFieldByPk(group);
this.sumParents(group);
@ -309,7 +309,7 @@ public class XmGroupService extends BaseService {
}
public void pushMsg(User user,XmProjectGroup g,List<Map<String,Object>> users){
public void pushMsg(User user, XmGroup g, List<Map<String,Object>> users){
pushMsgService.pushChannelGroupCreateMsg(user.getBranchId(),g.getProjectId(),g.getId(), g.getId(), g.getGroupName(), user.getUserid(), user.getUsername(), users,"新增小组["+g.getGroupName()+"]及以下组员："+ users.stream().map(i->(String)i.get("username")).collect(Collectors.joining(",")));
}
@ -389,12 +389,12 @@ public class XmGroupService extends BaseService {
if(userid.equals(g.getLeaderUserid())||userid.equals(g.getAssUserid())){
userGroups.add(g);
}else{
List<XmProjectGroupUser> gus=g.getGroupUsers();
List<XmGroupUser> gus=g.getGroupUsers();
boolean exists=false;
if(gus==null) {
continue;
}
for (XmProjectGroupUser gu : gus) {
for (XmGroupUser gu : gus) {
if(userid.equals(gu.getUserid())) {
exists=true;
break;
@ -495,7 +495,7 @@ public class XmGroupService extends BaseService {
}
return false;
}
public List<XmProjectGroupUser> getProjectManagers( List<XmGroupVo> xmProjectGroupVoList){
public List<XmGroupUser> getProjectManagers(List<XmGroupVo> xmProjectGroupVoList){
for (XmGroupVo g : xmProjectGroupVoList) {
if("nbxmjl".equals(g.getPgTypeId())) {
return g.getGroupUsers();
@ -518,11 +518,11 @@ public class XmGroupService extends BaseService {
if(xmProjectGroupVoList==null || xmProjectGroupVoList.size()==0) {
return false;
}
List<XmProjectGroupUser> getProjectManagers=this.getProjectManagers(xmProjectGroupVoList);
List<XmGroupUser> getProjectManagers=this.getProjectManagers(xmProjectGroupVoList);
if(getProjectManagers==null || getProjectManagers.size()==0) {
return false;
}
for (XmProjectGroupUser user : getProjectManagers) {
for (XmGroupUser user : getProjectManagers) {
if( user.getUserid().equals(pmUserid)) {
return true;
}
@ -559,11 +559,11 @@ public class XmGroupService extends BaseService {
public List<XmProjectGroup> parentIdPathsCalcBeforeSave(List<XmProjectGroup> nodes) {
List<XmProjectGroup> noExistsList=nodes.stream().filter(i->!nodes.stream().filter(k->k.getId().equals(i.getPgroupId())).findAny().isPresent()).collect(Collectors.toList());
public List<XmGroup> parentIdPathsCalcBeforeSave(List<XmGroup> nodes) {
List<XmGroup> noExistsList=nodes.stream().filter(i->!nodes.stream().filter(k->k.getId().equals(i.getPgroupId())).findAny().isPresent()).collect(Collectors.toList());
noExistsList=noExistsList.stream().filter(i->StringUtils.hasText(i.getPgroupId())).collect(Collectors.toList());
Map<String,String> hadCalcMap=new HashMap<>();
for (XmProjectGroup node : noExistsList) {
for (XmGroup node : noExistsList) {
if(hadCalcMap.containsKey(node.getPgroupId())){
String idPaths=hadCalcMap.get(node.getPgroupId());
node.setPidPaths(idPaths+node.getId()+",");
@ -574,7 +574,7 @@ public class XmGroupService extends BaseService {
hadCalcMap.put(node.getPgroupId(),idPaths);
}
}
for (XmProjectGroup node : nodes) {
for (XmGroup node : nodes) {
if(!StringUtils.hasText(node.getPgroupId())){
node.setPidPaths("0,"+node.getId()+",");
continue;
@ -583,12 +583,12 @@ public class XmGroupService extends BaseService {
String idPaths=hadCalcMap.get(node.getPgroupId());
node.setPidPaths(idPaths+node.getId()+",");
}else{
List<XmProjectGroup> pnodeList=this.getParentList(node,nodes);
List<XmGroup> pnodeList=this.getParentList(node,nodes);
if(pnodeList==null ||pnodeList.size()==0){
node.setPidPaths("0,"+node.getPgroupId()+","+node.getId()+",");
continue;
}
XmProjectGroup topParent=pnodeList.get(pnodeList.size()-1);
XmGroup topParent=pnodeList.get(pnodeList.size()-1);
String idPath="0,";
if(hadCalcMap.containsKey(topParent.getPgroupId())){
idPath=hadCalcMap.get(topParent.getPgroupId());
@ -599,7 +599,7 @@ public class XmGroupService extends BaseService {
node.setPidPaths(idPath+node.getId()+",");
}
}
for (XmProjectGroup node : nodes) {
for (XmGroup node : nodes) {
String idPaths=node.getPidPaths();
String[] idpss=idPaths.split(",");
node.setLvl(idpss.length-1);
@ -664,7 +664,7 @@ public class XmGroupService extends BaseService {
return tips;
}
public Tips checkHasEditProdcutGroupQx(User user,XmProjectGroup group,XmProjectGroup groupDb,XmProduct xmProductDb){
public Tips checkHasEditProdcutGroupQx(User user, XmGroup group, XmGroup groupDb, XmProduct xmProductDb){
Tips tips = new Tips("成功");
if(groupDb==null){
tips.setFailureMsg("data-0","该小组已不存在");
@ -698,7 +698,7 @@ public class XmGroupService extends BaseService {
pmUserMap.put(xmProject.getAssUserid(),xmProject.getAssUsername());
return pmUserMap;
}
public Tips checkHasEditProjectGroupQx(User user,XmProjectGroup group,XmProjectGroup groupDb,XmProject xmProject){
public Tips checkHasEditProjectGroupQx(User user, XmGroup group, XmGroup groupDb, XmProject xmProject){
Tips tips = new Tips("成功");
if(groupDb==null){
tips.setFailureMsg("data-0","该小组已不存在");
@ -734,14 +734,14 @@ public class XmGroupService extends BaseService {
return tips;
}
public Tips parentIdPathsCalcBeforeSave(XmProjectGroup currNode) {
public Tips parentIdPathsCalcBeforeSave(XmGroup currNode) {
Tips tips = new Tips("成功");
if (!StringUtils.hasText(currNode.getPgroupId()) || "0".equals(currNode.getPgroupId())) {
currNode.setPidPaths("0," + currNode.getId() + ",");
currNode.setLvl(1);
return tips;
} else {
List<XmProjectGroup> parentList=this.getParentList(currNode);
List<XmGroup> parentList=this.getParentList(currNode);
if(parentList==null ||parentList.size()==0){
currNode.setPidPaths("0,"+currNode.getPgroupId()+","+currNode.getId()+",");
currNode.setLvl(2);
@ -760,14 +760,14 @@ public class XmGroupService extends BaseService {
return tips;
}
private List<XmProjectGroup> getParentList(XmProjectGroup currNode){
List<XmProjectGroup> parentList=new ArrayList<>();
XmProjectGroup current=currNode;
private List<XmGroup> getParentList(XmGroup currNode){
List<XmGroup> parentList=new ArrayList<>();
XmGroup current=currNode;
while (true){
if(!StringUtils.hasText(current.getPgroupId()) || "0".equals(current.getPgroupId())){
return parentList;
}
XmProjectGroup query=new XmProjectGroup();
XmGroup query=new XmGroup();
query.setId(current.getPgroupId());
current=this.selectOneObject(query);
if(current==null){
@ -777,16 +777,16 @@ public class XmGroupService extends BaseService {
}
}
private List<XmProjectGroup> getParentList(XmProjectGroup currNode,List<XmProjectGroup> nodes){
List<XmProjectGroup> parentList=new ArrayList<>();
XmProjectGroup current=currNode;
private List<XmGroup> getParentList(XmGroup currNode, List<XmGroup> nodes){
List<XmGroup> parentList=new ArrayList<>();
XmGroup current=currNode;
while (true){
if(!StringUtils.hasText(current.getPgroupId()) || "0".equals(current.getPgroupId())){
return parentList;
}
XmProjectGroup query=new XmProjectGroup();
XmGroup query=new XmGroup();
query.setId(current.getPgroupId());
Optional<XmProjectGroup> optional=nodes.stream().filter(i->i.getId().equals(query.getId())).findFirst();
Optional<XmGroup> optional=nodes.stream().filter(i->i.getId().equals(query.getId())).findFirst();
if(optional.isPresent()){
current=optional.get();
parentList.add(current);
@ -799,7 +799,7 @@ public class XmGroupService extends BaseService {
@Transactional
public void sumParents(XmProjectGroup node){
public void sumParents(XmGroup node){
String id=node.getId();
String pidPaths=node.getPidPaths();
if(!StringUtils.hasText(pidPaths)){
@ -828,9 +828,9 @@ public class XmGroupService extends BaseService {
}
@Transactional
public void batchSumParents(List<XmProjectGroup> xmTasks) {
public void batchSumParents(List<XmGroup> xmTasks) {
List<Set<String>> list=new ArrayList<>();
for (XmProjectGroup node : xmTasks) {
for (XmGroup node : xmTasks) {
String id=node.getId();
String pidPaths=node.getPidPaths();
if(!StringUtils.hasText(pidPaths)){
@ -885,18 +885,18 @@ public class XmGroupService extends BaseService {
* @param delNodes 本批量需要删除的全部节点
* @return
*/
public boolean checkCanDelAllChild(XmProjectGroup delNode, List<XmProjectGroup> delNodes) {
public boolean checkCanDelAllChild(XmGroup delNode, List<XmGroup> delNodes) {
if(delNode==null){
return true;
}
if(delNode.getChildrenCnt()==null||delNode.getChildrenCnt()<=0){
return true;
}
List<XmProjectGroup> childList=delNodes.stream().filter(i->delNode.getId().equals(i.getPgroupId())).collect(Collectors.toList());
List<XmGroup> childList=delNodes.stream().filter(i->delNode.getId().equals(i.getPgroupId())).collect(Collectors.toList());
if(childList==null||childList.size()<delNode.getChildrenCnt()){
return false;
}
for (XmProjectGroup n : childList) {
for (XmGroup n : childList) {
if (!this.checkCanDelAllChild(n, delNodes)) {
return false;
}
@ -906,19 +906,19 @@ public class XmGroupService extends BaseService {
}
@Transactional
public void doDeleteByPk(XmProjectGroup xmProjectGroup,XmProjectGroup groupDb) {
public void doDeleteByPk(XmGroup xmProjectGroup, XmGroup groupDb) {
super.deleteByPk(xmProjectGroup);
this.sumParents(groupDb);
}
@Transactional
public void doBatchDeleteProductGroups(List<XmProjectGroup> canDelNodes) {
public void doBatchDeleteProductGroups(List<XmGroup> canDelNodes) {
super.batchDelete(canDelNodes);
batchSumParents(canDelNodes);
}
@Transactional
public void doBatchDeleteProjectGroups(List<XmProjectGroup> canDelNodes) {
public void doBatchDeleteProjectGroups(List<XmGroup> canDelNodes) {
super.batchDelete(canDelNodes);
batchSumParents(canDelNodes);
}
@ -926,13 +926,13 @@ public class XmGroupService extends BaseService {
public XmGroupVo getProductGroupFromCache(String productId, String groupId) {
XmGroupVo groupVo=groupCacheService.getProductGroup(productId,groupId);
if(groupVo==null){
XmProjectGroup group=this.selectOneObject(new XmProjectGroup(groupId));
XmGroup group=this.selectOneObject(new XmGroup(groupId));
if(group==null){
return null;
}else{
XmProjectGroupUser xmProjectGroupUser=new XmProjectGroupUser();
XmGroupUser xmProjectGroupUser=new XmGroupUser();
xmProjectGroupUser.setGroupId(groupId);
List<XmProjectGroupUser> users=this.xmProjectGroupUserService.selectListByWhere(xmProjectGroupUser);
List<XmGroupUser> users=this.xmProjectGroupUserService.selectListByWhere(xmProjectGroupUser);
XmGroupVo xmProjectGroupVo=new XmGroupVo();
BeanUtils.copyProperties(group,xmProjectGroupVo);
xmProjectGroupVo.setGroupUsers(users);
@ -946,13 +946,13 @@ public class XmGroupService extends BaseService {
public XmGroupVo getProjectGroupFromCache(String projectId, String groupId) {
XmGroupVo groupVo=groupCacheService.getProjectGroup(projectId,groupId);
if(groupVo==null){
XmProjectGroup group=this.selectOneObject(new XmProjectGroup(groupId));
XmGroup group=this.selectOneObject(new XmGroup(groupId));
if(group==null){
return null;
}else{
XmProjectGroupUser xmProjectGroupUser=new XmProjectGroupUser();
XmGroupUser xmProjectGroupUser=new XmGroupUser();
xmProjectGroupUser.setGroupId(groupId);
List<XmProjectGroupUser> users=this.xmProjectGroupUserService.selectListByWhere(xmProjectGroupUser);
List<XmGroupUser> users=this.xmProjectGroupUserService.selectListByWhere(xmProjectGroupUser);
XmGroupVo xmProjectGroupVo=new XmGroupVo();
BeanUtils.copyProperties(group,xmProjectGroupVo);
xmProjectGroupVo.setGroupUsers(users);

8
xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
View File

@ -1,7 +1,7 @@
package com.xm.core.service;
import com.mdp.core.service.BaseService;
import com.xm.core.entity.XmProjectGroupUser;
import com.xm.core.entity.XmGroupUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -18,16 +18,16 @@ public class XmGroupUserService extends BaseService {
@Autowired
XmRecordService xmRecordService;
public List<XmProjectGroupUser> selectGroupUserListByProjectId(String projectId) {
public List<XmGroupUser> selectGroupUserListByProjectId(String projectId) {
return this.selectList("selectGroupUserListByProjectId", projectId);
}
public List<XmProjectGroupUser> selectGroupUserListByProductId(String productId) {
public List<XmGroupUser> selectGroupUserListByProductId(String productId) {
return this.selectList("selectGroupUserListByProductId", productId);
}
public void doBatchDelete(List<XmProjectGroupUser> canDelUsers) {
public void doBatchDelete(List<XmGroupUser> canDelUsers) {
super.batchDelete(canDelUsers);
}

14
xm-core/src/main/java/com/xm/core/service/XmProductService.java
View File

@ -198,17 +198,17 @@ public class XmProductService extends BaseService {
}
}
List<XmProjectGroup> groupsDb=new ArrayList<>();
List<XmGroup> groupsDb=new ArrayList<>();
Map<String, String> newGroupIdMap = new HashMap<>();
if( "1".equals(xmProduct.getCopyGroup())||"1".equals(xmProduct.getCopyGroupUser())) {
XmProjectGroup groupQ = new XmProjectGroup();
XmGroup groupQ = new XmGroup();
groupQ.setProductId(xmProductDb.getId());
groupsDb = this.groupService.selectListByWhere(groupQ);
if (groupsDb != null && groupsDb.size() > 0) {
for (XmProjectGroup group : groupsDb) {
for (XmGroup group : groupsDb) {
newGroupIdMap.put(group.getId(), this.groupService.createKey("id"));
}
for (XmProjectGroup node : groupsDb) {
for (XmGroup node : groupsDb) {
String oldId = node.getId();
String newId = newGroupIdMap.get(oldId);
node.setProductId(xmProductTo.getId());
@ -229,11 +229,11 @@ public class XmProductService extends BaseService {
}
}
if(groupsDb.size()>0 && "1".equals(xmProduct.getCopyGroupUser())){
XmProjectGroupUser userQ=new XmProjectGroupUser();
XmGroupUser userQ=new XmGroupUser();
userQ.setProductId(xmProductDb.getId());
List<XmProjectGroupUser> usersDb=this.groupUserService.selectGroupUserListByProductId(xmProductDb.getId());
List<XmGroupUser> usersDb=this.groupUserService.selectGroupUserListByProductId(xmProductDb.getId());
if(usersDb!=null && usersDb.size()>0){
for (XmProjectGroupUser node : usersDb) {
for (XmGroupUser node : usersDb) {
node.setProjectId(null);
node.setProductId(xmProductTo.getId());
node.setGroupId(newGroupIdMap.get(node.getGroupId()));

14
xm-core/src/main/java/com/xm/core/service/XmProjectService.java
View File

@ -195,17 +195,17 @@ public class XmProjectService extends BaseService {
}
}
List<XmProjectGroup> groupsDb=new ArrayList<>();
List<XmGroup> groupsDb=new ArrayList<>();
Map<String, String> newGroupIdMap = new HashMap<>();
if( "1".equals(xmProject.getCopyGroup())||"1".equals(xmProject.getCopyGroupUser())) {
XmProjectGroup groupQ = new XmProjectGroup();
XmGroup groupQ = new XmGroup();
groupQ.setProjectId(xmProjectDb.getId());
groupsDb = this.groupService.selectListByWhere(groupQ);
if (groupsDb != null && groupsDb.size() > 0) {
for (XmProjectGroup group : groupsDb) {
for (XmGroup group : groupsDb) {
newGroupIdMap.put(group.getId(), this.groupService.createKey("id"));
}
for (XmProjectGroup node : groupsDb) {
for (XmGroup node : groupsDb) {
String oldId = node.getId();
String newId = newGroupIdMap.get(oldId);
node.setProjectId(xmProjectTo.getId());
@ -226,11 +226,11 @@ public class XmProjectService extends BaseService {
}
}
if(groupsDb.size()>0 && "1".equals(xmProject.getCopyGroupUser())){
XmProjectGroupUser userQ=new XmProjectGroupUser();
XmGroupUser userQ=new XmGroupUser();
userQ.setProjectId(xmProjectDb.getId());
List<XmProjectGroupUser> usersDb=this.groupUserService.selectGroupUserListByProjectId(xmProjectDb.getId());
List<XmGroupUser> usersDb=this.groupUserService.selectGroupUserListByProjectId(xmProjectDb.getId());
if(usersDb!=null && usersDb.size()>0){
for (XmProjectGroupUser node : usersDb) {
for (XmGroupUser node : usersDb) {
node.setProjectId(xmProjectTo.getId());
node.setGroupId(newGroupIdMap.get(node.getGroupId()));
node.setStatus("0");

12
xm-core/src/main/java/com/xm/core/vo/XmGroupVo.java
View File

@ -1,16 +1,16 @@
package com.xm.core.vo;
import com.xm.core.entity.XmProjectGroup;
import com.xm.core.entity.XmProjectGroupUser;
import com.xm.core.entity.XmGroup;
import com.xm.core.entity.XmGroupUser;
import io.swagger.annotations.ApiModel;
import java.util.List;
@ApiModel(description="xm_group")
public class XmGroupVo extends XmProjectGroup {
List<XmProjectGroupUser> groupUsers;
public class XmGroupVo extends XmGroup {
List<XmGroupUser> groupUsers;
public List<XmProjectGroupUser> getGroupUsers() { return groupUsers; }
public List<XmGroupUser> getGroupUsers() { return groupUsers; }
public void setGroupUsers(List<XmProjectGroupUser> groupUsers) { this.groupUsers = groupUsers; }
public void setGroupUsers(List<XmGroupUser> groupUsers) { this.groupUsers = groupUsers; }
}

20
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xm.core.entity.XmProjectGroup">
<mapper namespace="com.xm.core.entity.XmGroup">
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
@ -18,7 +18,7 @@
<if test="orCrowBranchId!=null and orCrowBranchId!=''"> and (res.branch_id=#{branchId} or res.crow_branch_id=#{orCrowBranchId})</if>
<if test="iterationId!=null and iterationId!=''"> and exists ( select 1 from xm_iteration_product_link ipl left join xm_product_project_link ppl on ipl.product_id=ppl.product_id and (ipl.product_id=res.product_id or ppl.project_id = res.project_id))</if>
</sql>
<delete id="deleteByProjectId" parameterType="com.xm.core.entity.XmProjectGroup">
<delete id="deleteByProjectId" parameterType="com.xm.core.entity.XmGroup">
delete from xm_group where project_id = #{projectId}
</delete>
@ -37,7 +37,7 @@
</select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroup" resultType="com.xm.core.entity.XmProjectGroup">
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmGroup" resultType="com.xm.core.entity.XmGroup">
select * from xm_group res
<where>
<include refid="where"/>
@ -45,7 +45,7 @@
</select>
<!-- 通过主键查询获取数据对象 返回object -->
<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroup" resultType="com.xm.core.entity.XmProjectGroup">
<select id="selectOneObject" parameterType="com.xm.core.entity.XmGroup" resultType="com.xm.core.entity.XmGroup">
select * from xm_group res
where
res.id = #{id}
@ -58,14 +58,14 @@
res.id = #{id}
</select>
<!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroup" resultType="long">
<select id="countByWhere" parameterType="com.xm.core.entity.XmGroup" resultType="long">
select count(1) from xm_group res
<where>
<include refid="where"/>
</where>
</select>
<!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroup" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmGroup" useGeneratedKeys="false" keyProperty="id">
insert into xm_group(
<include refid="columns"/>
) values (
@ -74,7 +74,7 @@
</insert>
<!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroup">
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmGroup">
delete from xm_group res
<where>
<include refid="where"/>
@ -82,13 +82,13 @@
</delete>
<!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroup">
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmGroup">
delete from xm_group
where id = #{id}
</delete>
<!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroup">
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmGroup">
update xm_group
<set>
<include refid="someFieldSet"/>
@ -97,7 +97,7 @@
</update>
<!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroup">
<update id="updateByPk" parameterType="com.xm.core.entity.XmGroup">
update xm_group
<set>
<include refid="set"/>

18
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupStateMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xm.core.entity.XmProjectGroupState">
<mapper namespace="com.xm.core.entity.XmGroupState">
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
@ -32,7 +32,7 @@
</select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="com.xm.core.entity.XmProjectGroupState">
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmGroupState" resultType="com.xm.core.entity.XmGroupState">
select * from xm_group_state res
<where>
<include refid="where"/>
@ -40,7 +40,7 @@
</select>
<!-- 通过主键查询获取数据对象 返回object -->
<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="com.xm.core.entity.XmProjectGroupState">
<select id="selectOneObject" parameterType="com.xm.core.entity.XmGroupState" resultType="com.xm.core.entity.XmGroupState">
select * from xm_group_state res
where
res.group_id = #{groupId}
@ -53,14 +53,14 @@
res.group_id = #{groupId}
</select>
<!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroupState" resultType="long">
<select id="countByWhere" parameterType="com.xm.core.entity.XmGroupState" resultType="long">
select count(1) from xm_group_state res
<where>
<include refid="where"/>
</where>
</select>
<!-- 新增一条记录 主键group_id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupState" useGeneratedKeys="false" keyProperty="group_id">
<insert id="insert" parameterType="com.xm.core.entity.XmGroupState" useGeneratedKeys="false" keyProperty="group_id">
insert into xm_group_state(
<include refid="columns"/>
) values (
@ -69,7 +69,7 @@
</insert>
<!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroupState">
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmGroupState">
delete from xm_group_state res
<where>
<include refid="where"/>
@ -77,13 +77,13 @@
</delete>
<!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmGroupState">
delete from xm_group_state
where group_id = #{groupId}
</delete>
<!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmGroupState">
update xm_group_state
<set>
<include refid="someFieldSet"/>
@ -92,7 +92,7 @@
</update>
<!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroupState">
<update id="updateByPk" parameterType="com.xm.core.entity.XmGroupState">
update xm_group_state
<set>
<include refid="set"/>

26
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xm.core.entity.XmProjectGroupUser">
<mapper namespace="com.xm.core.entity.XmGroupUser">
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
@ -16,25 +16,25 @@
<if test="mngUsernamekey != null and mngUsernamekey !='' "> and (g.leader_username like concat('%',#{mngUsernamekey},'%') or g.ass_username like concat('%',#{mngUsernamekey},'%')) </if>
<if test="groupUsernameKey != null and groupUsernameKey !='' "> and res.username like concat('%',#{groupUsernameKey},'%') </if>
</sql>
<delete id="deleteByGroupId" parameterType="com.xm.core.entity.XmProjectGroupUser">
<delete id="deleteByGroupId" parameterType="com.xm.core.entity.XmGroupUser">
delete from xm_group_user where group_id = #{groupId}
</delete>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectGroupUserListByProjectId" parameterType="String" resultType="com.xm.core.entity.XmProjectGroupUser">
<select id="selectGroupUserListByProjectId" parameterType="String" resultType="com.xm.core.entity.XmGroupUser">
select * from xm_group_user res
<where>
exists( select 1 from xm_group g where g.id=res.group_id and g.project_id=#{projectId})
</where>
</select>
<select id="selectGroupUserListByProductId" parameterType="String" resultType="com.xm.core.entity.XmProjectGroupUser">
<select id="selectGroupUserListByProductId" parameterType="String" resultType="com.xm.core.entity.XmGroupUser">
select * from xm_group_user res
<where>
exists( select 1 from xm_group g where g.id=res.group_id and g.product_id=#{productId})
</where>
</select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProjectGroupUser">
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmGroupUser">
select * from xm_group_user res where (res.group_id, res.userid) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.groupId}, #{item.userid})
@ -55,7 +55,7 @@
</select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroupUser" resultType="com.xm.core.entity.XmProjectGroupUser">
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmGroupUser" resultType="com.xm.core.entity.XmGroupUser">
select * from xm_group_user res
<where>
<include refid="where"/>
@ -63,7 +63,7 @@
</select>
<!-- 通过主键查询获取数据对象 返回object -->
<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroupUser" resultType="com.xm.core.entity.XmProjectGroupUser">
<select id="selectOneObject" parameterType="com.xm.core.entity.XmGroupUser" resultType="com.xm.core.entity.XmGroupUser">
select * from xm_group_user res
where
res.group_id = #{groupId}
@ -78,14 +78,14 @@
and res.userid = #{userid}
</select>
<!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroupUser" resultType="long">
<select id="countByWhere" parameterType="com.xm.core.entity.XmGroupUser" resultType="long">
select count(1) from xm_group_user res
<where>
<include refid="where"/>
</where>
</select>
<!-- 新增一条记录 主键group_id,userid,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupUser" useGeneratedKeys="false" >
<insert id="insert" parameterType="com.xm.core.entity.XmGroupUser" useGeneratedKeys="false" >
insert into xm_group_user(
<include refid="columns"/>
) values (
@ -94,7 +94,7 @@
</insert>
<!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroupUser">
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmGroupUser">
delete from xm_group_user res
<where>
<include refid="where"/>
@ -102,13 +102,13 @@
</delete>
<!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroupUser">
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmGroupUser">
delete from xm_group_user
where group_id = #{groupId} and userid = #{userid}
</delete>
<!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroupUser">
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmGroupUser">
update xm_group_user
<set>
<include refid="someFieldSet"/>
@ -117,7 +117,7 @@
</update>
<!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroupUser">
<update id="updateByPk" parameterType="com.xm.core.entity.XmGroupUser">
update xm_group_user
<set>
<include refid="set"/>

Write Preview
Loading…
Cancel
Save