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

团队重构

master
陈裕财 3 years ago
parent
f724fcef01
commit
83f77408f1
3 changed files with 28 additions and 28 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. 18
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
  2. 26
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  3. 12
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

18
xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
View File

@ -292,7 +292,7 @@ public class XmMenuController {
if(xmProduct==null){ if(xmProduct==null){
return ResponseHelper.failed("data-0","产品已不存在"); return ResponseHelper.failed("data-0","产品已不存在");
} }
tips=productQxService.checkProductQx(xmProduct,0,user);
tips=productQxService.checkProductQx(xmProduct,2,user);
if(!tips.isOk()){ if(!tips.isOk()){
return failed(tips); return failed(tips);
} }
@ -360,7 +360,7 @@ public class XmMenuController {
if(xmProduct==null){ if(xmProduct==null){
return ResponseHelper.failed("product-data-0","产品已不存在"); return ResponseHelper.failed("product-data-0","产品已不存在");
} }
tips=productQxService.checkProductQx(null,xmProduct,0,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null);
tips=productQxService.checkProductQx(null,xmProduct,2,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null);
if(!tips.isOk()){ if(!tips.isOk()){
return failed(tips); return failed(tips);
} }
@ -400,7 +400,7 @@ public class XmMenuController {
if(xmProduct==null){ if(xmProduct==null){
return ResponseHelper.failed("product-data-0","产品已不存在"); return ResponseHelper.failed("product-data-0","产品已不存在");
} }
tips=productQxService.checkProductQx(null,xmProduct,0,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null);
tips=productQxService.checkProductQx(null,xmProduct,2,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null);
if(!tips.isOk()){ if(!tips.isOk()){
return failed(tips); return failed(tips);
} }
@ -480,7 +480,7 @@ public class XmMenuController {
return ResponseHelper.failed("product-data-0","产品已不存在"); return ResponseHelper.failed("product-data-0","产品已不存在");
} }
Map<String,List<XmGroupVo>> groupsMap=new HashMap<>(); Map<String,List<XmGroupVo>> groupsMap=new HashMap<>();
tips=productQxService.checkProductQx(groupsMap,xmProduct,0,user);
tips=productQxService.checkProductQx(groupsMap,xmProduct,2,user);
if(!tips.isOk()){ if(!tips.isOk()){
return failed(tips); return failed(tips);
} }
@ -488,11 +488,11 @@ public class XmMenuController {
String mmUserid= (String) xmMenuMap.get("mmUserid"); String mmUserid= (String) xmMenuMap.get("mmUserid");
String mmUsername= (String) xmMenuMap.get("mmUsername"); String mmUsername= (String) xmMenuMap.get("mmUsername");
if(!user.getUserid().equals(mmUserid)){ if(!user.getUserid().equals(mmUserid)){
tips=productQxService.checkProductScopeQx(groupsMap,xmProduct,0,user,mmUserid,mmUsername,null);
tips=productQxService.checkProductScopeQx(groupsMap,xmProduct,2,user,mmUserid,mmUsername,null);
if(!tips.isOk()){ if(!tips.isOk()){
return failed(tips); return failed(tips);
} }
tips=productQxService.checkProductTransmitQx(groupsMap,xmProduct,0,user,mmUserid,mmUsername);
tips=productQxService.checkProductTransmitQx(groupsMap,xmProduct,2,user,mmUserid,mmUsername);
if(!tips.isOk()){ if(!tips.isOk()){
return failed(tips); return failed(tips);
} }
@ -502,7 +502,7 @@ public class XmMenuController {
List<XmMenu> noOper=new ArrayList<>(); List<XmMenu> noOper=new ArrayList<>();
Map<String,Tips> noOperTips=new HashMap<>(); Map<String,Tips> noOperTips=new HashMap<>();
for (XmMenu xm : xmMenusDb) { for (XmMenu xm : xmMenusDb) {
tips=productQxService.checkProductQx(groupsMap,xmProduct,0,user,xm.getMmUserid(), xm.getMmUsername(), null);
tips=productQxService.checkProductQx(groupsMap,xmProduct,2,user,xm.getMmUserid(), xm.getMmUsername(), null);
if(tips.isOk()){ if(tips.isOk()){
canOper.add(xm); canOper.add(xm);
}else{ }else{
@ -591,7 +591,7 @@ public class XmMenuController {
return ResponseHelper.failed("product-data-0","产品已不存在"); return ResponseHelper.failed("product-data-0","产品已不存在");
} }
for (XmMenu xm : xmMenusDb) { for (XmMenu xm : xmMenusDb) {
tips=productQxService.checkProductQx(groupsMap,xmProduct,0,user,xm.getMmUserid(),xm.getMmUsername(),null);
tips=productQxService.checkProductQx(groupsMap,xmProduct,2,user,xm.getMmUserid(),xm.getMmUsername(),null);
if(tips.isOk()){ if(tips.isOk()){
canOper.add(xm); canOper.add(xm);
}else{ }else{
@ -729,7 +729,7 @@ public class XmMenuController {
return ResponseHelper.failed("product-data-0","产品已不存在"); return ResponseHelper.failed("product-data-0","产品已不存在");
} }
for (XmMenu xm : xmMenusDb) { for (XmMenu xm : xmMenusDb) {
tips=productQxService.checkProductQx(groupsMap,xmProduct,0,user,xm.getMmUserid(),xm.getMmUsername(),null);
tips=productQxService.checkProductQx(groupsMap,xmProduct,2,user,xm.getMmUserid(),xm.getMmUsername(),null);
if(tips.isOk()){ if(tips.isOk()){
canOper.add(xm); canOper.add(xm);
}else{ }else{

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

@ -348,9 +348,9 @@ public class XmTaskController {
projectMap.put(xmProject.getId(),xmProject); projectMap.put(xmProject.getId(),xmProject);
Tips tips1=new Tips("成功"); Tips tips1=new Tips("成功");
if(isPm){ if(isPm){
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,0,createUserid,createUsername,cbranchId);
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,createUserid,createUsername,cbranchId);
}else{ }else{
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,0,user,createUserid,createUsername,cbranchId);
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,createUserid,createUsername,cbranchId);
} }
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
@ -367,7 +367,7 @@ public class XmTaskController {
xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId());
projectMap.put(xmTaskDb.getProjectId(),xmProject); projectMap.put(xmTaskDb.getProjectId(),xmProject);
} }
tips=projectQxService.checkProjectQx(groupsMap,xmProject,0,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
tips=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips.isOk()){ if(!tips.isOk()){
no.add(xmTaskDb); no.add(xmTaskDb);
}else{ }else{
@ -575,7 +575,7 @@ public class XmTaskController {
} }
XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskVo.getProjectId()); XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskVo.getProjectId());
Tips tips1=projectQxService.checkProjectQx(xmProject,0,user);
Tips tips1=projectQxService.checkProjectQx(xmProject,2,user);
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -720,7 +720,7 @@ public class XmTaskController {
return ResponseHelper.failed("existsExecuser","有待验收、待结算的执行人，不能删除"); return ResponseHelper.failed("existsExecuser","有待验收、待结算的执行人，不能删除");
}; };
XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId());
Tips tips1=projectQxService.checkProjectQx(null,xmProject,0,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -765,11 +765,11 @@ public class XmTaskController {
XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId());
Map<String,List<XmGroupVo>> groupsMap=new HashMap<>(); Map<String,List<XmGroupVo>> groupsMap=new HashMap<>();
Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,0,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,0,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),xmTaskVo.getCbranchId());
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),xmTaskVo.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -822,7 +822,7 @@ public class XmTaskController {
} }
XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId());
Tips tips1=projectQxService.checkProjectQx(null,xmProject,0,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -876,9 +876,9 @@ public class XmTaskController {
} }
XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId());
Map<String,List<XmGroupVo>> groupsMap=new HashMap<>(); Map<String,List<XmGroupVo>> groupsMap=new HashMap<>();
Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,0,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,0,user,xmTaskDb.getExecutorUserid(),xmTaskDb.getExecutorUsername(),null);
tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskDb.getExecutorUserid(),xmTaskDb.getExecutorUsername(),null);
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -966,7 +966,7 @@ public class XmTaskController {
String projectId=batchImportVo.getProjectId(); String projectId=batchImportVo.getProjectId();
String productId=batchImportVo.getProductId(); String productId=batchImportVo.getProductId();
XmProject xmProject=xmProjectService.getProjectFromCache(projectId); XmProject xmProject=xmProjectService.getProjectFromCache(projectId);
Tips tips1=projectQxService.checkProjectQx(null,xmProject,0,user);
Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user);
if(!tips1.isOk()){ if(!tips1.isOk()){
return ResponseHelper.failed(tips1); return ResponseHelper.failed(tips1);
} }
@ -1328,7 +1328,7 @@ public class XmTaskController {
String projectId=xmTaskDb.getProjectId(); String projectId=xmTaskDb.getProjectId();
XmProject xmProject=xmProjectService.getProjectFromCache(projectId); XmProject xmProject=xmProjectService.getProjectFromCache(projectId);
Map<String,List<XmGroupVo>> groupsMap=new HashMap<>(); Map<String,List<XmGroupVo>> groupsMap=new HashMap<>();
tips=projectQxService.checkProjectQx(groupsMap,xmProject,0,user);
tips=projectQxService.checkProjectQx(groupsMap,xmProject,2,user);
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
@ -1341,7 +1341,7 @@ public class XmTaskController {
} }
} }
for (XmTask node : delNodesDbMap.values()) { for (XmTask node : delNodesDbMap.values()) {
Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,0,user,node.getCreateUserid(),node.getCreateUsername(),node.getCbranchId());
Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,node.getCreateUserid(),node.getCreateUsername(),node.getCbranchId());
if(!tips1.isOk()){ if(!tips1.isOk()){
noAllowNodes.add(node); noAllowNodes.add(node);
}else { }else {

12
xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
View File

@ -282,7 +282,7 @@ public class XmTaskExecuserController {
break; break;
} }
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务 if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(xmTask.getProjectId()),0, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
}; };
@ -360,7 +360,7 @@ public class XmTaskExecuserController {
} }
Map<String,List<XmGroupVo>> groupsMap=new HashMap<>(); Map<String,List<XmGroupVo>> groupsMap=new HashMap<>();
groupsMap.put(xmProject.getId(),pgroups); groupsMap.put(xmProject.getId(),pgroups);
tips=projectQxService.checkProjectQx(groupsMap,xmProject,0,user);
tips=projectQxService.checkProjectQx(groupsMap,xmProject,2,user);
if(tips.isOk()) { if(tips.isOk()) {
boolean exists=groupService.checkUserExistsGroup(pgroups, xmTaskExecuser.getUserid()); boolean exists=groupService.checkUserExistsGroup(pgroups, xmTaskExecuser.getUserid());
@ -449,7 +449,7 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskDb.getProjectId(); String projectId=xmTaskDb.getProjectId();
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),0,user );
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user );
if(!tips.isOk()){ if(!tips.isOk()){
return ResponseHelper.failed(tips); return ResponseHelper.failed(tips);
} }
@ -538,7 +538,7 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId(); String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
} }
if(tips.isOk()) { if(tips.isOk()) {
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid())); XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid()));
@ -588,7 +588,7 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId(); String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
} }
if(tips.isOk()) { if(tips.isOk()) {
xmTaskExecuserService.becomeCandidate(xmTaskExecuser); xmTaskExecuserService.becomeCandidate(xmTaskExecuser);
@ -633,7 +633,7 @@ public class XmTaskExecuserController {
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskDb.getId(),xmTaskExecuser.getUserid())); XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskDb.getId(),xmTaskExecuser.getUserid()));
if(xmTaskExecuserDb !=null ) { if(xmTaskExecuserDb !=null ) {
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),0,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId());
tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId());
} }
if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) { if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) {
xmTaskExecuserService.delete(xmTaskExecuser); xmTaskExecuserService.delete(xmTaskExecuser);

Write Preview
Loading…
Cancel
Save