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

添加候选人到团队中

master
陈裕财 4 years ago
parent
1fa8f956c1
commit
7ea1526b4c
3 changed files with 31 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
  2. 86
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  3. 10
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml

15
xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
View File

@ -158,21 +158,12 @@ public class XmProductController {
xmProduct.put("userid",user.getUserid()); xmProduct.put("userid",user.getUserid());
if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null
||ids!=null ) ){ ||ids!=null ) ){
if(LoginUtils.isBranchAdmin()){
xmProduct.put("branchId",user.getBranchId());
}else{
if(!LoginUtils.isBranchAdmin()){
xmProduct.put("compete",user.getUserid()); xmProduct.put("compete",user.getUserid());
} }
} }
if(!StringUtils.hasText((String) xmProduct.get("isTpl"))){
xmProduct.put("isTpl","0");
}else{
if("1".equals(xmProduct.get("isTpl"))){
xmProduct.remove("branchId");
xmProduct.put("myBranchId",user.getBranchId());
xmProduct.put("platformBranchId",platformBranchId);
}
}
xmProduct.put("platformBranchId",platformBranchId);
xmProduct.put("linkBranchId",user.getBranchId());
List<Map<String,Object>> xmProductList = xmProductService.selectListMapByWhereWithState(xmProduct); //列出XmProduct列表 List<Map<String,Object>> xmProductList = xmProductService.selectListMapByWhereWithState(xmProduct); //列出XmProduct列表
PageUtils.responePage(m, xmProductList); PageUtils.responePage(m, xmProductList);
m.put("data",xmProductList); m.put("data",xmProductList);

86
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
View File

@ -128,24 +128,22 @@ public class XmTaskController {
RequestUtils.transformArray(xmTask, "tagIdList"); RequestUtils.transformArray(xmTask, "tagIdList");
PageUtils.startPage(xmTask); PageUtils.startPage(xmTask);
String taskOut= (String) xmTask.get("taskOut"); String taskOut= (String) xmTask.get("taskOut");
if(!"1".equals(taskOut)){
String projectId= (String) xmTask.get("projectId");
String myExecuserStatus= (String) xmTask.get("myExecuserStatus");
String isMy= (String) xmTask.get("isMy");
String myFocus= (String) xmTask.get("myFocus");
String createUserid= (String) xmTask.get("createUserid");
String executorUserid= (String) xmTask.get("executorUserid");
String menuId= (String) xmTask.get("menuId");
String productId= (String) xmTask.get("productId");
String iterationId= (String) xmTask.get("iterationId");
User user = LoginUtils.getCurrentUserInfo();
xmTask.put("userid",user.getUserid());
if( !(StringUtils.hasText(projectId)
|| StringUtils.hasText(myExecuserStatus)|| StringUtils.hasText(isMy)|| StringUtils.hasText(myFocus)|| StringUtils.hasText(createUserid)
|| StringUtils.hasText(executorUserid) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(iterationId)) ){
xmTask.put("compete",user.getUserid());
}
String projectId= (String) xmTask.get("projectId");
String myExecuserStatus= (String) xmTask.get("myExecuserStatus");
String isMy= (String) xmTask.get("isMy");
String myFocus= (String) xmTask.get("myFocus");
String createUserid= (String) xmTask.get("createUserid");
String executorUserid= (String) xmTask.get("executorUserid");
String menuId= (String) xmTask.get("menuId");
String productId= (String) xmTask.get("productId");
String iterationId= (String) xmTask.get("iterationId");
User user = LoginUtils.getCurrentUserInfo();
xmTask.put("userid",user.getUserid());
if( !(StringUtils.hasText(projectId)
|| StringUtils.hasText(myExecuserStatus)|| StringUtils.hasText(isMy)|| StringUtils.hasText(myFocus)|| StringUtils.hasText(createUserid)
|| StringUtils.hasText(executorUserid) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(iterationId)) ){
xmTask.put("compete",user.getUserid());
} }
List<Map<String,Object>> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 List<Map<String,Object>> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表
PageUtils.responePage(m,xmTaskVoList); PageUtils.responePage(m,xmTaskVoList);
@ -229,55 +227,9 @@ public class XmTaskController {
RequestUtils.transformArray(xmTask, "skillIds"); RequestUtils.transformArray(xmTask, "skillIds");
PageUtils.startPage(xmTask); PageUtils.startPage(xmTask);
xmTask.put("taskOut","1"); xmTask.put("taskOut","1");
String isDefault= (String) xmTask.get("isDefault");
String pageNum= (String) xmTask.get("pageNum");
String queryKeys="xm-out-tasks-default-"+pageNum;
List<Map<String,Object>> xmTaskVoList=new ArrayList<>();
if(!StringUtils.hasText(isDefault)){
tips.setFailureMsg("isDefault-not-set","isDefault","isDefault参数必传，默认查询isDefault=1,非默认查询isDefault=0");
}else if("1".equals(isDefault)){
PageSerializable<Map<String,Object>> tasks =xmTaskCacheService.getTasks(queryKeys);
if(tasks==null){
xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表
tasks=new PageSerializable<>(xmTaskVoList);
xmTaskCacheService.putTasks(queryKeys,tasks);
PageUtils.responePage(m,xmTaskVoList);
}else{
xmTaskVoList=tasks.getList();
m.put("total",tasks.getTotal());
}
}else {
xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表
PageUtils.responePage(m,xmTaskVoList);
if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop")) && xmTaskVoList.size()>0){
Set<String> pidPathsSet=new HashSet<>();
Set<String> idSet=new HashSet<>();
for (Map<String, Object> map : xmTaskVoList) {
String id= (String) map.get("id");
idSet.add(id);
String pidPaths= (String) map.get("pidPaths");
pidPaths=PubTool.getPidPaths(pidPaths,id);
if(pidPaths.length()<=3){
continue;
}
pidPathsSet.add(pidPaths);
}
if(pidPathsSet!=null && pidPathsSet.size()>0){
List<Map<String,Object>> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList())));
parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList());
if(parentList!=null && parentList.size()>0){
xmTaskVoList.addAll(parentList);
m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size());
}
}
}
}
m.put("data",xmTaskVoList);
List<Map<String,Object>> tasks=xmTaskService.getTask(xmTask);
PageUtils.responePage(m,tasks);
m.put("data",tasks);
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }

10
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
View File

@ -22,11 +22,19 @@
</if> </if>
<if test="ctimeStart!=null and ctimeEnd!=null ">and ctime between #{ctimeStart} and #{ctimeEnd}</if> <if test="ctimeStart!=null and ctimeEnd!=null ">and ctime between #{ctimeStart} and #{ctimeEnd}</if>
<if test="isTpl!=null and isTpl=='1'"> <if test="isTpl!=null and isTpl=='1'">
and (res.branch_id in( #{platformBranchId},#{myBranchId}) and res.is_tpl='1')
and (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1')
</if> </if>
<if test="del==null or del==''"> <if test="del==null or del==''">
and res.del!="1" and res.del!="1"
</if> </if>
<if test="linkBranchId!=null and linkBranchId!=''">
and ( res.branch_id = #{linkBranchId}
<if test="isTpl!=null and isTpl=='1'">
or (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1')
</if>
)
</if>
</sql> </sql>
<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">

Write Preview
Loading…
Cancel
Save