Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
0997714fc1
  1. 28
      xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
  2. 28
      xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java
  3. 44
      xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java
  4. 9
      xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
  5. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
  6. 10
      xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java
  7. 7
      xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
  8. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java
  9. 6
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
  10. 174
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java
  11. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
  12. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  13. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
  14. 6
      xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java
  15. 6
      xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java
  16. 2
      xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java
  17. 6
      xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java
  18. 10
      xm-core/src/main/java/com/xm/core/service/XmGroupService.java
  19. 6
      xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java
  20. 6
      xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
  21. 4
      xm-core/src/main/java/com/xm/core/service/XmProductService.java
  22. 28
      xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java
  23. 6
      xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
  24. 4
      xm-core/src/main/java/com/xm/core/service/XmProjectService.java
  25. 2
      xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
  26. 2
      xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java
  27. 2
      xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java
  28. 28
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml
  29. 26
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupStateMapper.xml
  30. 36
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml
  31. 4
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
  32. 167
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml
  33. 4
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml
  34. 2
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
  35. 2
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml
  36. 2
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml

xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java → xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java

xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupStateController.java → xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java

xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java → xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java

9
xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java

@ -2,15 +2,10 @@ package com.xm.core.ctrl;
import com.mdp.core.entity.Tips; import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException; import com.mdp.core.err.BizException;
import com.mdp.core.utils.RequestUtils;
import com.mdp.core.utils.ResponseHelper; import com.mdp.core.utils.ResponseHelper;
import com.mdp.mybatis.PageUtils;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmIteration;
import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmMenu;
import com.xm.core.service.XmMenuService; import com.xm.core.service.XmMenuService;
import com.xm.core.service.XmProjectGroupService;
import com.xm.core.service.XmGroupService;
import com.xm.core.service.XmRecordService; import com.xm.core.service.XmRecordService;
import com.xm.core.service.push.XmMenuPushMsgService; import com.xm.core.service.push.XmMenuPushMsgService;
import com.xm.core.vo.XmIterationMenuVo; import com.xm.core.vo.XmIterationMenuVo;
@ -52,7 +47,7 @@ public class XmIterationMenuController {
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
@Autowired @Autowired
XmMenuController xmMenuController; XmMenuController xmMenuController;

5
xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@ -12,10 +12,9 @@ import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.PubTool; import com.xm.core.PubTool;
import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmMenu;
import com.xm.core.entity.XmProjectPhase;
import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTask;
import com.xm.core.service.XmMenuService; import com.xm.core.service.XmMenuService;
import com.xm.core.service.XmProjectGroupService;
import com.xm.core.service.XmGroupService;
import com.xm.core.service.XmRecordService; import com.xm.core.service.XmRecordService;
import com.xm.core.service.XmTaskService; import com.xm.core.service.XmTaskService;
import com.xm.core.vo.XmMenuVo; import com.xm.core.vo.XmMenuVo;
@ -61,7 +60,7 @@ public class XmMenuController {
private XmRecordService xmRecordService; private XmRecordService xmRecordService;
@Autowired @Autowired
private XmProjectGroupService groupService;
private XmGroupService groupService;
@ApiOperation( value = "查询项目菜单表信息列表",notes="listXmMenu,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiOperation( value = "查询项目菜单表信息列表",notes="listXmMenu,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@ApiImplicitParams({ @ApiImplicitParams({

10
xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java

@ -3,19 +3,13 @@ package com.xm.core.ctrl;
import com.mdp.core.entity.Tips; import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException; import com.mdp.core.err.BizException;
import com.mdp.core.utils.ResponseHelper; import com.mdp.core.utils.ResponseHelper;
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.XmMenu;
import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmProjectGroup;
import com.xm.core.service.XmMenuService; import com.xm.core.service.XmMenuService;
import com.xm.core.service.XmProductService; import com.xm.core.service.XmProductService;
import com.xm.core.service.XmProjectGroupService;
import com.xm.core.service.XmGroupService;
import com.xm.core.service.XmRecordService; import com.xm.core.service.XmRecordService;
import com.xm.core.service.push.XmMenuPushMsgService; import com.xm.core.service.push.XmMenuPushMsgService;
import com.xm.core.vo.XmPhaseMenusVo; import com.xm.core.vo.XmPhaseMenusVo;
import com.xm.core.vo.XmPhaseMenusVo;
import com.xm.core.vo.XmProjectGroupVo;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -59,7 +53,7 @@ public class XmPhaseMenuController {
XmMenuController xmMenuController; XmMenuController xmMenuController;
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
@Autowired @Autowired

7
xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java

@ -11,10 +11,8 @@ import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmProduct; import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmProductCopyVo; import com.xm.core.entity.XmProductCopyVo;
import com.xm.core.entity.XmProject;
import com.xm.core.service.XmProductService; import com.xm.core.service.XmProductService;
import com.xm.core.service.XmProjectGroupService;
import com.xm.core.service.XmProjectService;
import com.xm.core.service.XmGroupService;
import com.xm.core.service.XmRecordService; import com.xm.core.service.XmRecordService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -25,7 +23,6 @@ import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* url编制采用rest风格,如对XM.xm_product 产品表的操作有增删改查,对应的url分别为:<br> * url编制采用rest风格,如对XM.xm_product 产品表的操作有增删改查,对应的url分别为:<br>
@ -49,7 +46,7 @@ public class XmProductController {
private XmProductService xmProductService; private XmProductService xmProductService;
@Autowired @Autowired
private XmProjectGroupService groupService;
private XmGroupService groupService;
@Autowired @Autowired

4
xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java

@ -12,11 +12,9 @@ import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.PubTool; import com.xm.core.PubTool;
import com.xm.core.entity.XmProduct; import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmProjectPhase; import com.xm.core.entity.XmProjectPhase;
import com.xm.core.service.*; import com.xm.core.service.*;
import com.xm.core.vo.XmProjectGroupVo; import com.xm.core.vo.XmProjectGroupVo;
import com.xm.core.vo.XmProjectPhaseVo;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -52,7 +50,7 @@ public class XmProductPhaseController {
private XmProjectPhaseService xmProjectPhaseService; private XmProjectPhaseService xmProjectPhaseService;
@Autowired @Autowired
private XmProjectGroupService groupService;
private XmGroupService groupService;
@Autowired @Autowired
private XmProductService xmProductService; private XmProductService xmProductService;

6
xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@ -12,8 +12,6 @@ import com.mdp.qx.HasQx;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmProject; import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmProjectPhase;
import com.xm.core.entity.XmTask;
import com.xm.core.service.*; import com.xm.core.service.*;
import com.xm.core.vo.XmProjectCopyVo; import com.xm.core.vo.XmProjectCopyVo;
import com.xm.core.vo.XmProjectGroupVo; import com.xm.core.vo.XmProjectGroupVo;
@ -21,14 +19,12 @@ import com.xm.core.vo.XmProjectVo;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* url编制采用rest风格,如对XM.xm_project xm_project的操作有增删改查,对应的url分别为:<br> * url编制采用rest风格,如对XM.xm_project xm_project的操作有增删改查,对应的url分别为:<br>
@ -51,7 +47,7 @@ public class XmProjectController {
@Autowired @Autowired
private XmProjectService xmProjectService; private XmProjectService xmProjectService;
@Autowired @Autowired
private XmProjectGroupService groupService;
private XmGroupService groupService;
@Autowired @Autowired

174
xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java

@ -1,174 +0,0 @@
package com.xm.core.ctrl;
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.XmProjectGroupFormwork;
import com.xm.core.service.XmProjectGroupFormworkService;
import io.swagger.annotations.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* url编制采用rest风格,如对XM.xm_project_group_formwork xm_project_group_formwork的操作有增删改查,对应的url分别为:<br>
* 新增: xm/xmProjectGroupFormwork/add <br>
* 查询: xm/xmProjectGroupFormwork/list<br>
* 模糊查询: xm/xmProjectGroupFormwork/listKey<br>
* 修改: xm/xmProjectGroupFormwork/edit <br>
* 删除: xm/xmProjectGroupFormwork/del<br>
* 批量删除: xm/xmProjectGroupFormwork/batchDel<br>
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 实体 XmProjectGroupFormwork XM.xm_project_group_formwork 当前主键(包括多主键): id;
***/
@RestController("xm.core.xmProjectGroupFormworkController")
@RequestMapping(value="/**/xm/core/xmProjectGroupFormwork")
@Api(tags={"xm_project_group_formwork操作接口"})
public class XmProjectGroupFormworkController {
static Log logger=LogFactory.getLog(XmProjectGroupFormworkController.class);
@Autowired
private XmProjectGroupFormworkService xmProjectGroupFormworkService;
@ApiOperation( value = "查询xm_project_group_formwork信息列表",notes="listXmProjectGroupFormwork,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@ApiImplicitParams({
@ApiImplicitParam(name="id",value="主键,主键",required=false),
@ApiImplicitParam(name="branchId",value="机构编号",required=false),
@ApiImplicitParam(name="groupName",value="团队名称",required=false),
@ApiImplicitParam(name="isPub",value="是否公共,0为否,1为是",required=false),
@ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
@ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false),
@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时,会自动计算总记录数,如果上传>0的不自动计算",required=false),
@ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false),
@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应,升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
})
@ApiResponses({
@ApiResponse(code = 200,response= XmProjectGroupFormwork.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Map<String,Object> listXmProjectGroupFormwork( @RequestParam Map<String,Object> xmProjectGroupFormwork){
Map<String,Object> m = new HashMap<>();
RequestUtils.transformArray(xmProjectGroupFormwork, "ids");
PageUtils.startPage(xmProjectGroupFormwork);
List<Map<String,Object>> xmProjectGroupFormworkList = xmProjectGroupFormworkService.getAllGroupName(xmProjectGroupFormwork); //列出XmProjectGroupFormwork列表
PageUtils.responePage(m, xmProjectGroupFormworkList);
m.put("data",xmProjectGroupFormworkList);
Tips tips=new Tips("查询成功");
m.put("tips", tips);
return m;
}
@ApiOperation( value = "新增一条xm_project_group_formwork信息",notes="addXmProjectGroupFormwork,主键如果为空,后台自动生成")
@ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroupFormwork.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/add",method=RequestMethod.POST)
public Map<String,Object> addXmProjectGroupFormwork(@RequestBody XmProjectGroupFormwork xmProjectGroupFormwork) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功新增一条数据");
try{
if(StringUtils.isEmpty(xmProjectGroupFormwork.getId())) {
xmProjectGroupFormwork.setId(xmProjectGroupFormworkService.createKey("id"));
}else{
XmProjectGroupFormwork xmProjectGroupFormworkQuery = new XmProjectGroupFormwork(xmProjectGroupFormwork.getId());
if(xmProjectGroupFormworkService.countByWhere(xmProjectGroupFormworkQuery)>0){
tips.setFailureMsg("编号重复,请修改编号再提交");
m.put("tips", tips);
return m;
}
}
xmProjectGroupFormworkService.insert(xmProjectGroupFormwork);
m.put("data",xmProjectGroupFormwork);
}catch (BizException e) {
tips=e.getTips();
logger.error("",e);
}catch (Exception e) {
tips.setFailureMsg(e.getMessage());
logger.error("",e);
}
m.put("tips", tips);
return m;
}
@ApiOperation( value = "删除一条xm_project_group_formwork信息",notes="delXmProjectGroupFormwork,仅需要上传主键字段")
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
})
@RequestMapping(value="/del",method=RequestMethod.POST)
public Map<String,Object> delXmProjectGroupFormwork(@RequestBody XmProjectGroupFormwork xmProjectGroupFormwork){
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除一条数据");
try{
xmProjectGroupFormworkService.deleteByPk(xmProjectGroupFormwork);
}catch (BizException e) {
tips=e.getTips();
logger.error("",e);
}catch (Exception e) {
tips.setFailureMsg(e.getMessage());
logger.error("",e);
}
m.put("tips", tips);
return m;
}
/**
@ApiOperation( value = "根据主键修改一条xm_project_group_formwork信息",notes="editXmProjectGroupFormwork")
@ApiResponses({
@ApiResponse(code = 200,response=XmProjectGroupFormwork.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/edit",method=RequestMethod.POST)
public Map<String,Object> editXmProjectGroupFormwork(@RequestBody XmProjectGroupFormwork xmProjectGroupFormwork) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功更新一条数据");
try{
xmProjectGroupFormworkService.updateByPk(xmProjectGroupFormwork);
m.put("data",xmProjectGroupFormwork);
}catch (BizException e) {
tips=e.getTips();
logger.error("",e);
}catch (Exception e) {
tips.setFailureMsg(e.getMessage());
logger.error("",e);
}
m.put("tips", tips);
return m;
}
*/
/**
@ApiOperation( value = "根据主键列表批量删除xm_project_group_formwork信息",notes="batchDelXmProjectGroupFormwork,仅需要上传主键字段")
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
@RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Map<String,Object> batchDelXmProjectGroupFormwork(@RequestBody List<XmProjectGroupFormwork> xmProjectGroupFormworks) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功删除"+xmProjectGroupFormworks.size()+"条数据");
try{
xmProjectGroupFormworkService.batchDelete(xmProjectGroupFormworks);
}catch (BizException e) {
tips=e.getTips();
logger.error("",e);
}catch (Exception e) {
tips.setFailureMsg(e.getMessage());
logger.error("",e);
}
m.put("tips", tips);
return m;
}
*/
}

3
xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java

@ -15,7 +15,6 @@ import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmProjectPhase; import com.xm.core.entity.XmProjectPhase;
import com.xm.core.service.*; import com.xm.core.service.*;
import com.xm.core.vo.XmProjectGroupVo; import com.xm.core.vo.XmProjectGroupVo;
import com.xm.core.vo.XmProjectPhaseVo;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -51,7 +50,7 @@ public class XmProjectPhaseController {
private XmProjectPhaseService xmProjectPhaseService; private XmProjectPhaseService xmProjectPhaseService;
@Autowired @Autowired
private XmProjectGroupService groupService;
private XmGroupService groupService;
@Autowired @Autowired
private XmProjectService xmProjectService; private XmProjectService xmProjectService;

2
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -60,7 +60,7 @@ public class XmTaskController {
private XmTaskService xmTaskService; private XmTaskService xmTaskService;
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
@Autowired @Autowired
private XmRecordService xmRecordService; private XmRecordService xmRecordService;

8
xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@ -13,8 +13,8 @@ import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTask;
import com.xm.core.entity.XmTaskExecuser; import com.xm.core.entity.XmTaskExecuser;
import com.xm.core.service.XmProjectGroupService;
import com.xm.core.service.XmProjectGroupUserService;
import com.xm.core.service.XmGroupService;
import com.xm.core.service.XmGroupUserService;
import com.xm.core.service.XmTaskExecuserService; import com.xm.core.service.XmTaskExecuserService;
import com.xm.core.service.XmTaskService; import com.xm.core.service.XmTaskService;
import com.xm.core.vo.XmProjectGroupVo; import com.xm.core.vo.XmProjectGroupVo;
@ -55,14 +55,14 @@ public class XmTaskExecuserController {
private XmTaskService xmTaskService; private XmTaskService xmTaskService;
@Autowired @Autowired
XmProjectGroupUserService xmProjectGroupUserService;
XmGroupUserService xmProjectGroupUserService;
@Autowired @Autowired
ItemService itemService; ItemService itemService;
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
@ApiOperation( value = "查询xm_task_execuser信息列表",notes="listXmTaskExecuser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiOperation( value = "查询xm_task_execuser信息列表",notes="listXmTaskExecuser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@ApiImplicitParams({ @ApiImplicitParams({

6
xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java

@ -8,12 +8,12 @@ import java.util.Date;
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectGroup所有属性名: <br> * 实体 XmProjectGroup所有属性名: <br>
* id,groupName,projectId,pgTypeId,pgTypeName,leaderUserid,leaderUsername,ctime,ltime,productId,branchId,pgClass,pgroupId,lvl,pidPaths,isTpl,assUserid,assUsername,childrenCnt,userCnt,qxCode,calcWorkload,ntype,crowBranchId,crowBranchName,isCrow;<br> * id,groupName,projectId,pgTypeId,pgTypeName,leaderUserid,leaderUsername,ctime,ltime,productId,branchId,pgClass,pgroupId,lvl,pidPaths,isTpl,assUserid,assUsername,childrenCnt,userCnt,qxCode,calcWorkload,ntype,crowBranchId,crowBranchName,isCrow;<br>
* xm_project_group xm_project_group的所有字段名: <br>
* xm_group xm_group的所有字段名: <br>
* id,group_name,project_id,pg_type_id,pg_type_name,leader_userid,leader_username,ctime,ltime,product_id,branch_id,pg_class,pgroup_id,lvl,pid_paths,is_tpl,ass_userid,ass_username,children_cnt,user_cnt,qx_code,calc_workload,ntype,crow_branch_id,crow_branch_name,is_crow;<br> * id,group_name,project_id,pg_type_id,pg_type_name,leader_userid,leader_username,ctime,ltime,product_id,branch_id,pg_class,pgroup_id,lvl,pid_paths,is_tpl,ass_userid,ass_username,children_cnt,user_cnt,qx_code,calc_workload,ntype,crow_branch_id,crow_branch_name,is_crow;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ApiModel(description="xm_project_group")
@ApiModel(description="xm_group")
public class XmProjectGroup implements java.io.Serializable { public class XmProjectGroup implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -102,7 +102,7 @@ public class XmProjectGroup implements java.io.Serializable {
this.id = id; this.id = id;
} }
/**xm_project_group**/
/**xm_group**/
public XmProjectGroup() { public XmProjectGroup() {
} }

6
xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java

@ -7,12 +7,12 @@ import io.swagger.annotations.ApiModelProperty;
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br> * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 实体 XmProjectGroupFormwork所有属性名: <br> * 实体 XmProjectGroupFormwork所有属性名: <br>
* id,branchId,groupName,isPub,pgTypeId,pgTypeName;<br> * id,branchId,groupName,isPub,pgTypeId,pgTypeName;<br>
* XM.xm_project_group_formwork xm_project_group_formwork的所有字段名: <br>
* XM.xm_group_formwork xm_group_formwork的所有字段名: <br>
* id,branch_id,group_name,is_pub,pg_type_id,pg_type_name;<br> * id,branch_id,group_name,is_pub,pg_type_id,pg_type_name;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ApiModel(description="xm_project_group_formwork")
@ApiModel(description="xm_group_formwork")
public class XmProjectGroupFormwork implements java.io.Serializable { public class XmProjectGroupFormwork implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -41,7 +41,7 @@ public class XmProjectGroupFormwork implements java.io.Serializable {
this.id = id; this.id = id;
} }
/**xm_project_group_formwork**/
/**xm_group_formwork**/
public XmProjectGroupFormwork() { public XmProjectGroupFormwork() {
} }

2
xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java

@ -9,7 +9,7 @@ import java.math.BigDecimal;
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectGroupState所有属性名: <br> * 实体 XmProjectGroupState所有属性名: <br>
* planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,bizDate,bugCnt,groupId,projectId,projectName,groupName;<br> * planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,ctime,calcTime,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,bizDate,bugCnt,groupId,projectId,projectName,groupName;<br>
* xm_project_group_state 功能状态表,无需前端维护所有数据由汇总统计得出的所有字段名: <br>
* xm_group_state 功能状态表,无需前端维护所有数据由汇总统计得出的所有字段名: <br>
* plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt,group_id,project_id,project_name,group_name;<br> * plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,ctime,calc_time,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt,group_id,project_id,project_name,group_name;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* group_id;<br> * group_id;<br>

6
xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java

@ -8,12 +8,12 @@ import java.util.Date;
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectGroupUser所有属性名: <br> * 实体 XmProjectGroupUser所有属性名: <br>
* joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo,projectId,productId,pgClass,obranchName;<br> * joinTime,groupId,userid,username,outTime,status,obranchId,isPri,seqNo,projectId,productId,pgClass,obranchName;<br>
* xm_project_group_user xm_project_group_user的所有字段名: <br>
* xm_group_user xm_group_user的所有字段名: <br>
* join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id,pg_class,obranch_name;<br> * join_time,group_id,userid,username,out_time,status,obranch_id,is_pri,seq_no,project_id,product_id,pg_class,obranch_name;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* group_id,userid;<br> * group_id,userid;<br>
*/ */
@ApiModel(description="xm_project_group_user")
@ApiModel(description="xm_group_user")
public class XmProjectGroupUser implements java.io.Serializable { public class XmProjectGroupUser implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -64,7 +64,7 @@ public class XmProjectGroupUser implements java.io.Serializable {
this.userid = userid; this.userid = userid;
} }
/**xm_project_group_user**/
/**xm_group_user**/
public XmProjectGroupUser() { public XmProjectGroupUser() {
} }

xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java → xm-core/src/main/java/com/xm/core/service/XmGroupService.java

xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java → xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java

xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java → xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java

4
xm-core/src/main/java/com/xm/core/service/XmProductService.java

@ -38,10 +38,10 @@ public class XmProductService extends BaseService {
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
@Autowired @Autowired
XmProjectGroupUserService groupUserService;
XmGroupUserService groupUserService;
@Autowired @Autowired

28
xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java

@ -1,28 +0,0 @@
package com.xm.core.service;
import com.mdp.core.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br>
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 实体 XmProjectGroupFormwork XM.xm_project_group_formwork 当前主键(包括多主键): id;
***/
@Service("xm.core.xmProjectGroupFormworkService")
public class XmProjectGroupFormworkService extends BaseService {
@Autowired
XmRecordService xmRecordService;
public List<Map<String, Object>> getAllGroupName(Map<String, Object> map) {
return this.getDao().selectList(this.statement("selectAllGroupFormWork"), map);
}
/** 请在此类添加自定义函数 */
}

6
xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java

@ -6,11 +6,7 @@ import com.mdp.core.utils.NumberUtil;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmProjectPhase; import com.xm.core.entity.XmProjectPhase;
import com.xm.core.entity.XmProjectPhase;
import com.xm.core.entity.XmTask;
import com.xm.core.vo.XmProjectGroupVo; import com.xm.core.vo.XmProjectGroupVo;
import com.xm.core.vo.XmProjectPhaseVo;
import org.apache.poi.sl.usermodel.FreeformShape;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -34,7 +30,7 @@ public class XmProjectPhaseService extends BaseService {
XmRecordService xmRecordService; XmRecordService xmRecordService;
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
/** /**
* 查询项目及计划总预算用于判断是否超出预算 * 查询项目及计划总预算用于判断是否超出预算
*/ */

4
xm-core/src/main/java/com/xm/core/service/XmProjectService.java

@ -60,10 +60,10 @@ public class XmProjectService extends BaseService {
XmProjectPhaseService xmProjectPhaseService; XmProjectPhaseService xmProjectPhaseService;
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
@Autowired @Autowired
XmProjectGroupUserService groupUserService;
XmGroupUserService groupUserService;
public XmProject getProjectFromCache(String projectId) { public XmProject getProjectFromCache(String projectId) {

2
xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java

@ -39,7 +39,7 @@ public class XmTaskExecuserService extends BaseService {
XmTaskService xmTaskService; XmTaskService xmTaskService;
@Autowired @Autowired
XmProjectGroupService groupService;
XmGroupService groupService;
@Autowired @Autowired

2
xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java

@ -43,7 +43,7 @@ public class XmProjectGroupCacheService {
} }
} }
String getCacheKey() { String getCacheKey() {
return "xm_project_group";
return "xm_group";
} }
public List<XmProjectGroupVo> getProjectGroups(String projectId){ public List<XmProjectGroupVo> getProjectGroups(String projectId){

2
xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java

@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
import java.util.List; import java.util.List;
@ApiModel(description="xm_project_group")
@ApiModel(description="xm_group")
public class XmProjectGroupVo extends XmProjectGroup { public class XmProjectGroupVo extends XmProjectGroup {
List<XmProjectGroupUser> groupUsers; List<XmProjectGroupUser> groupUsers;

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml → xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupMapper.xml

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml → xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupStateMapper.xml

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml → xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml

4
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml

@ -18,7 +18,7 @@
) )
</if> </if>
<if test="compete !=null and compete!=''"> <if test="compete !=null and compete!=''">
and ( exists ( select 1 from xm_project_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
and ( exists ( select 1 from xm_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
or res.pm_userid=#{compete} or res.pm_userid=#{compete}
or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id) or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id)
) )
@ -48,7 +48,7 @@
and exists( select 1 from xm_iteration_product_link ipl where ipl.product_id =res.id and ipl.iteration_id=#{iterationId} ) and exists( select 1 from xm_iteration_product_link ipl where ipl.product_id =res.id and ipl.iteration_id=#{iterationId} )
</if> </if>
<if test="compete !=null and compete!=''"> <if test="compete !=null and compete!=''">
and ( exists ( select 1 from xm_project_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
and ( exists ( select 1 from xm_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id )
or res.pm_userid=#{compete} or res.pm_userid=#{compete}
or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id) or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id)
) )

167
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml

@ -1,167 +0,0 @@
<?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.XmProjectGroupFormwork">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<select id="selectAllGroupFormWork" parameterType="HashMap" resultType="HashMap">
select * from xm_project_group_formwork res
<where>
<if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if>
or res.is_pub = "1"
</where>
</select>
<!--结束 自定义sql函数区域-->
<!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select * from xm_project_group_formwork res
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<include refid="where"/>
<if test="key != null and key !='' "> </if>
</where>
</select>
<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->
<select id="selectListByWhere" parameterType="com.xm.core.entity.XmProjectGroupFormwork" resultType="com.xm.core.entity.XmProjectGroupFormwork">
select * from xm_project_group_formwork res
<where>
<include refid="where"/>
</where>
</select>
<!-- 通过主键查询获取数据对象 返回object -->
<select id="selectOneObject" parameterType="com.xm.core.entity.XmProjectGroupFormwork" resultType="com.xm.core.entity.XmProjectGroupFormwork">
select * from xm_project_group_formwork res
where
res.id = #{id}
</select>
<!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_project_group_formwork res
where
res.id = #{id}
</select>
<!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmProjectGroupFormwork" resultType="long">
select count(1) from xm_project_group_formwork res
<where>
<include refid="where"/>
</where>
</select>
<!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectGroupFormwork" useGeneratedKeys="false" keyProperty="id">
insert into xm_project_group_formwork(
<include refid="columns"/>
) values (
#{id},#{branchId},#{groupName},#{isPub},#{pgTypeId},#{pgTypeName}
)
</insert>
<!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
delete from xm_project_group_formwork res
<where>
<include refid="where"/>
</where>
</delete>
<!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
delete from xm_project_group_formwork
where id = #{id}
</delete>
<!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
update xm_project_group_formwork
<set>
<include refid="someFieldSet"/>
</set>
where id = #{id}
</update>
<!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmProjectGroupFormwork">
update xm_project_group_formwork
<set>
<include refid="set"/>
</set>
where id = #{id}
</update>
<!-- 批量新增 批量插入 借用insert 循环插入实现
<insert id="batchInsert" parameterType="List">
</insert>
-->
<!-- 批量更新 -->
<update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" >
update xm_project_group_formwork
set
<include refid="batchSet"/>
where id = #{item.id}
</foreach>
</update>
<!-- 批量删除 -->
<delete id="batchDelete" parameterType="List">
delete from xm_project_group_formwork
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
</delete>
<!--sql片段 列-->
<sql id="columns">
id,branch_id,group_name,is_pub,pg_type_id,pg_type_name
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where">
<if test="id != null and id != ''"> and res.id = #{id} </if>
<if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if>
<if test="groupName != null and groupName != ''"> and res.group_name = #{groupName} </if>
<if test="isPub != null and isPub != ''"> and res.is_pub = #{isPub} </if>
<if test="pgTypeId != null and pgTypeId != ''"> and res.pg_type_id = #{pgTypeId} </if>
<if test="pgTypeName != null and pgTypeName != ''"> and res.pg_type_name = #{pgTypeName} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
branch_id = #{branchId},
group_name = #{groupName},
is_pub = #{isPub},
pg_type_id = #{pgTypeId},
pg_type_name = #{pgTypeName}
</sql>
<sql id="someFieldSet">
<if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if>
<if test="groupName != null and groupName != ''"> group_name = #{groupName}, </if>
<if test="isPub != null and isPub != ''"> is_pub = #{isPub}, </if>
<if test="pgTypeId != null and pgTypeId != ''"> pg_type_id = #{pgTypeId}, </if>
<if test="pgTypeName != null and pgTypeName != ''"> pg_type_name = #{pgTypeName}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
branch_id = #{item.branchId},
group_name = #{item.groupName},
is_pub = #{item.isPub},
pg_type_id = #{item.pgTypeId},
pg_type_name = #{item.pgTypeName}
</sql>
</mapper>

4
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

@ -23,14 +23,14 @@
</if> </if>
<!-- 我参与的 包括我创建的,我监控的,我审核的--> <!-- 我参与的 包括我创建的,我监控的,我审核的-->
<if test=" compete !=null and compete !='' "> <if test=" compete !=null and compete !='' ">
and ( exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id )
and ( exists ( select 1 from xm_group g,XM.xm_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id )
or res.create_userid=#{compete} or res.create_userid=#{compete}
or exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} ) or exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} )
) )
</if> </if>
<!-- 按参与角色查询等--> <!-- 按参与角色查询等-->
<if test="pgTypeIds != null "> <if test="pgTypeIds != null ">
and exists ( select 1 from xm_project_group g,XM.xm_project_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id
and exists ( select 1 from xm_group g,XM.xm_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id
and g.pg_type_id in and g.pg_type_id in
<foreach collection="pgTypeIds" item="item" index="index" open="(" separator="," close=")" > <foreach collection="pgTypeIds" item="item" index="index" open="(" separator="," close=")" >
#{item} #{item}

2
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml

@ -27,7 +27,7 @@
</foreach> </foreach>
</if> </if>
<if test="compete !=null and compete!=''"> <if test="compete !=null and compete!=''">
and exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and (gu.project_id=res.project_id or gu.product_id=res.product_id))
and exists ( select 1 from xm_group_user gu where gu.userid=#{compete} and (gu.project_id=res.project_id or gu.product_id=res.product_id))
</if> </if>
<if test="key != null and key !='' "> and res.name like #{key} </if> <if test="key != null and key !='' "> and res.name like #{key} </if>
<if test="work != null and work != ''"> and res.status != 'resolved' </if> <if test="work != null and work != ''"> and res.status != 'resolved' </if>

2
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

@ -45,7 +45,7 @@
) )
</if> </if>
<if test="compete !=null and compete!=''"> <if test="compete !=null and compete!=''">
and ( exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
and ( exists ( select 1 from xm_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
or exists ( select 1 from xm_task_execuser exe where exe.project_id=res.project_id and exe.userid=#{compete}) or exists ( select 1 from xm_task_execuser exe where exe.project_id=res.project_id and exe.userid=#{compete})
) )

2
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml

@ -44,7 +44,7 @@
</foreach> </foreach>
</if> </if>
<if test="compete !=null and compete!=''"> <if test="compete !=null and compete!=''">
and exists ( select 1 from xm_project_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
and exists ( select 1 from xm_group_user gu where gu.userid=#{compete} and gu.project_id=res.project_id )
</if> </if>
<if test="productId != null and productId !='' "> and exists( select 1 from xm_menu m where m.menu_id =res.menu_id and m.product_id=#{productId}) </if> <if test="productId != null and productId !='' "> and exists( select 1 from xm_menu m where m.menu_id =res.menu_id and m.product_id=#{productId}) </if>
<if test="key != null and key !='' "> and res.case_name like #{key} </if> <if test="key != null and key !='' "> and res.case_name like #{key} </if>

Loading…
Cancel
Save