陈裕财 2 years ago
parent
commit
ee47bde079
  1. 20
      xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
  2. 12
      xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java
  3. 16
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
  4. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java
  5. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java
  6. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java
  7. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java
  8. 6
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java
  9. 6
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
  10. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java
  11. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java
  12. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java
  13. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java
  14. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java
  15. 40
      xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
  16. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java
  17. 141
      xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java
  18. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java
  19. 273
      xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
  20. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java
  21. 6
      xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java
  22. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java
  23. 298
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  24. 9
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java
  25. 167
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
  26. 44
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
  27. 53
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java
  28. 13
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
  29. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java
  30. 49
      xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
  31. 38
      xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
  32. 29
      xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java
  33. 28
      xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java
  34. 9
      xm-core/src/main/java/com/xm/core/service/XmQuestionService.java

20
xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java

@ -118,7 +118,7 @@ public class XmGroupController {
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
tips=projectQxService.checkProjectScopeQx(project,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
Tips tips=projectQxService.checkProjectScopeQx(project,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
@ -128,7 +128,7 @@ public class XmGroupController {
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
tips=projectQxService.checkProjectScopeQx(project,0,group.getAssUserid(),group.getAssUsername(),null);
Tips tips=projectQxService.checkProjectScopeQx(project,0,group.getAssUserid(),group.getAssUsername(),null);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
@ -147,7 +147,7 @@ public class XmGroupController {
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
tips=productQxService.checkProductScopeQx(product,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
Tips tips=productQxService.checkProductScopeQx(product,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
@ -157,7 +157,7 @@ public class XmGroupController {
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
tips=productQxService.checkProductScopeQx(product,0,group.getAssUserid(),group.getAssUsername(),null);
Tips tips=productQxService.checkProductScopeQx(product,0,group.getAssUserid(),group.getAssUsername(),null);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
@ -268,11 +268,11 @@ public class XmGroupController {
if(project==null){
return ResponseHelper.failed("project-0","项目已不存在");
}
tips=this.xmGroupService.checkProjectStatus(project);
Tips tips=this.xmGroupService.checkProjectStatus(project);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
tips=checkProjectGroupQxForAdd(project,u,xmGroup);
Tips tips=checkProjectGroupQxForAdd(project,u,xmGroup);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
@ -287,11 +287,11 @@ public class XmGroupController {
if(xmProduct==null){
return ResponseHelper.failed("product-0","产品已不存在");
}
tips=this.xmGroupService.checkProductStatus(xmProduct);
Tips tips=this.xmGroupService.checkProductStatus(xmProduct);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
tips=checkProductGroupQxForAdd(xmProduct,u,xmGroup);
Tips tips=checkProductGroupQxForAdd(xmProduct,u,xmGroup);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
@ -391,7 +391,7 @@ public class XmGroupController {
}
boolean isPm=xmGroupService.checkUserIsProjectAdm(project,u.getUserid());
if(!isPm) {
tips=projectQxService.checkProjectQx(project,0,u,groupDb.getLeaderUserid(),groupDb.getLeaderUsername(), null);
Tips tips=projectQxService.checkProjectQx(project,0,u,groupDb.getLeaderUserid(),groupDb.getLeaderUsername(), null);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
@ -403,7 +403,7 @@ public class XmGroupController {
}
boolean isPm=xmGroupService.checkUserIsProductAdm(product,u.getUserid());
if(!isPm) {
tips=productQxService.checkProductQx(product,0,u,groupDb.getLeaderUserid(),groupDb.getLeaderUsername(), null);
Tips tips=productQxService.checkProductQx(product,0,u,groupDb.getLeaderUserid(),groupDb.getLeaderUsername(), null);
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}

12
xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java

@ -254,9 +254,7 @@ public class XmIterationController {
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if( !isPm ){
tips = productQxService.checkProductQx(xmProductDb,3,user,iterationDb.getAdminUserid(),iterationDb.getAdminUsername(),null);
if(!tips.isOk()){
return Result.error(tips);
}
Result.assertIsFalse(tips);
}
@ -289,9 +287,7 @@ public class XmIterationController {
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if( !isPm ){
tips = productQxService.checkProductQx(xmProductDb,3,user,iterationDb.getAdminUserid(),iterationDb.getAdminUsername(),null);
if(!tips.isOk()){
return Result.error(tips);
}
Result.assertIsFalse(tips);
}
xmIteration.setAdminUserid(null);//不允许更改负责人
xmIteration.setAdminUsername(null);
@ -348,7 +344,7 @@ public class XmIterationController {
String adminUserid= (String) xmIterationMap.get("adminUserid");
String adminUsername= (String) xmIterationMap.get("adminUsername");
if(StringUtils.hasText(adminUserid)){
tips=productQxService.checkProductQx(xmProductDb,3,user,adminUserid,adminUsername,null);
Tips tips=productQxService.checkProductQx(xmProductDb,3,user,adminUserid,adminUsername,null);
if(!tips.isOk()){
return Result.error(tips);
}
@ -358,7 +354,7 @@ public class XmIterationController {
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
for (XmIteration iterationDb2 : xmIterationsDb) {
if( !isPm ){
tips=productQxService.checkProductQx(xmProductDb,3,user,iterationDb2.getAdminUserid(),iterationDb2.getAdminUsername(),null);
Tips tips=productQxService.checkProductQx(xmProductDb,3,user,iterationDb2.getAdminUserid(),iterationDb2.getAdminUsername(),null);
if(!tips.isOk()){
no.add(iterationDb2);
noTipsMap.put(tips.getMsg(),tips);

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

@ -278,10 +278,8 @@ public class XmMenuController {
return Result.error(tips);
}
if(StringUtils.hasText(xmMenu.getMmUserid()) && !xmMenu.getMmUserid().equals(user.getUserid())){
tips=productQxService.checkProductQx(xmProduct,2,user,xmMenu.getMmUserid(),xmMenu.getMmUsername(),null);
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProduct,2,user,xmMenu.getMmUserid(),xmMenu.getMmUsername(),null);
Result.assertIsFalse(tips);
}
@ -345,7 +343,7 @@ public class XmMenuController {
return ResponseHelper.failed("product-data-0","产品已不存在");
}
if(!groupService.checkUserIsProductAdm(xmProduct, user.getUserid())){
tips=productQxService.checkProductQx(xmProduct,2,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null);
Tips tips=productQxService.checkProductQx(xmProduct,2,user,xmMenuDb.getMmUserid(),xmMenuDb.getMmUsername(),null);
if(!tips.isOk()){
return Result.error(tips);
}
@ -456,7 +454,7 @@ public class XmMenuController {
String mmUserid= (String) xmMenuMap.get("mmUserid");
String mmUsername= (String) xmMenuMap.get("mmUsername");
if(!user.getUserid().equals(mmUserid)){
tips=productQxService.checkProductQx(xmProduct,2,user,mmUserid,mmUsername,null);
Tips tips=productQxService.checkProductQx(xmProduct,2,user,mmUserid,mmUsername,null);
if(!tips.isOk()){
return Result.error(tips);
}
@ -469,7 +467,7 @@ public class XmMenuController {
canOper.addAll(xmMenusDb);
}else{
for (XmMenu xm : xmMenusDb) {
tips=productQxService.checkProductQx(xmProduct,2,user,xm.getMmUserid(), xm.getMmUsername(), null);
Tips tips=productQxService.checkProductQx(xmProduct,2,user,xm.getMmUserid(), xm.getMmUsername(), null);
if(tips.isOk()){
canOper.add(xm);
}else{
@ -560,7 +558,7 @@ public class XmMenuController {
canOper.addAll(xmMenusDb);
}else{
for (XmMenu xm : xmMenusDb) {
tips=productQxService.checkProductQx(xmProduct,2,user,xm.getMmUserid(),xm.getMmUsername(),null);
Tips tips=productQxService.checkProductQx(xmProduct,2,user,xm.getMmUserid(),xm.getMmUsername(),null);
if(tips.isOk()){
canOper.add(xm);
}else{
@ -685,7 +683,7 @@ public class XmMenuController {
canOper.addAll(xmMenusDb);
}else{
for (XmMenu xm : xmMenusDb) {
tips=productQxService.checkProductQx(xmProduct,2,user,xm.getMmUserid(),xm.getMmUsername(),null);
Tips tips=productQxService.checkProductQx(xmProduct,2,user,xm.getMmUserid(),xm.getMmUsername(),null);
if(tips.isOk()){
canOper.add(xm);
}else{

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

@ -135,7 +135,7 @@ public class XmProductController {
params.put("platformBranchId",platformBranchId);
}
}
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProduct> qw = QueryTools.initQueryWrapper(XmProduct.class , params);
List<Map<String,Object>> datas = xmProductService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProduct列表
@ -233,7 +233,7 @@ public class XmProductController {
xmProductQuery.setCode(xmProduct.getCode());
if(xmProductService.countByWhere(xmProductQuery)>0){
return Result.error("产品代号已存在,请修改再提交");
}
}
if(xmProduct.getLinks()!=null && xmProduct.getLinks().size()>0){

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

@ -1,9 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.BaseUtils;
import com.mdp.core.utils.RequestUtils;
@ -68,7 +67,7 @@ public class XmProductProjectLinkController {
RequestUtils.transformArray(params, "projectIds");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProductProjectLink> qw = QueryTools.initQueryWrapper(XmProductProjectLink.class , params);
List<Map<String,Object>> datas = xmProductProjectLinkService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProductProjectLink列表

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

@ -1,8 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
@ -100,7 +100,7 @@ public class XmProductStateController {
IPage page=QueryTools.initPage(params);
User user= LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProductState> qw = QueryTools.initQueryWrapper(XmProductState.class , params);
List<Map<String,Object>> datas = xmProductStateService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProductState列表

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

@ -1,5 +1,6 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.query.QueryTools;
@ -59,7 +60,7 @@ public class XmProductStateHisController {
IPage page=QueryTools.initPage(params);
User user= LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProductStateHis> qw = QueryTools.initQueryWrapper(XmProductStateHis.class , params);
List<Map<String,Object>> datas = QueryTools.xmProductStateHisService(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProductStateHis列表

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

@ -1,5 +1,6 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.query.QueryTools;
@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import java.util.Map;
/**
* url编制采用rest风格,如对XM.xm_project_contract xm_project_contract的操作有增删改查,对应的url分别为:<br>
@ -58,7 +60,9 @@ public class XmProjectContractController {
RequestUtils.transformArray(params, "htIds");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmProjectContract> qw=QueryTools.initQueryWrapper(XmProjectContract.class,params);
List<Map<String,Object>> datas= xmProjectContractService.selectListMapByWhere(page,qw,params);
return Result.ok().setData(datas).setTotal(page.getTotal());
}

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

@ -1,11 +1,11 @@
package com.xm.core.ctrl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.audit.log.client.annotation.AuditLog;
import com.mdp.audit.log.client.annotation.OperType;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.BaseUtils;
@ -32,8 +32,6 @@ import springfox.documentation.annotations.ApiIgnore;
import java.util.*;
import java.util.stream.Collectors;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对XM.xm_project xm_project的操作有增删改查,对应的url分别为:<br>
* 新增: xm/xmProject/add <br>
@ -119,7 +117,7 @@ public class XmProjectController {
}
params.put("linkBranchId",user.getBranchId());
params.put("platformBranchId",platformBranchId);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProject> qw = QueryTools.initQueryWrapper(XmProject.class , params);
List<Map<String,Object>> datas = xmProjectService.getProject(params); //列出XmProject列表
return Result.ok().setData(datas);

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

@ -1,10 +1,11 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmProjectKpi;
import com.xm.core.service.XmProjectKpiService;
import io.swagger.annotations.*;
@ -73,7 +74,7 @@ public class XmProjectKpiController {
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProjectKpi> qw = QueryTools.initQueryWrapper(XmProjectKpi.class , params);
List<Map<String,Object>> datas = xmProjectKpiService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProjectKpi列表

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

@ -1,5 +1,6 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.query.QueryTools;
@ -76,7 +77,7 @@ public class XmProjectKpiHisController {
RequestUtils.transformArray(params, "kpiIds");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProjectKpiHis> qw = QueryTools.initQueryWrapper(XmProjectKpiHis.class , params);
List<Map<String,Object>> datas = xmProjectKpiHisService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProjectKpiHis列表

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

@ -1,8 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
@ -121,7 +121,7 @@ public class XmProjectStateController {
IPage page=QueryTools.initPage(params);
User user= LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProjectState> qw = QueryTools.initQueryWrapper(XmProjectState.class , params);
List<Map<String,Object>> datas = xmProjectStateService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProjectState列表

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

@ -1,11 +1,13 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmProjectStateHis;
import com.xm.core.service.XmProjectStateHisService;
import io.swagger.annotations.*;
@ -117,7 +119,7 @@ public class XmProjectStateHisController {
IPage page=QueryTools.initPage(params);
User user= LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProjectStateHis> qw = QueryTools.initQueryWrapper(XmProjectStateHis.class , params);
List<Map<String,Object>> datas = xmProjectStateHisService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProjectStateHis列表

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

@ -1,8 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.xm.core.entity.XmProjectTaskTypeState;
@ -79,7 +79,7 @@ public class XmProjectTaskTypeStateController {
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmProjectTaskTypeState> qw = QueryTools.initQueryWrapper(XmProjectTaskTypeState.class , params);
List<Map<String,Object>> datas = xmProjectTaskTypeStateService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmProjectTaskTypeState列表

40
xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java

@ -1,5 +1,6 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.audit.log.client.annotation.AuditLog;
import com.mdp.audit.log.client.annotation.OperType;
@ -127,9 +128,9 @@ public class XmQuestionController {
}
}
List<Map<String,Object>> datas = xmQuestionService.getQuestion(params); //列出XmQuestion列表
return Result.ok().setData(datas);
QueryWrapper<XmQuestion> qw=QueryTools.initQueryWrapper(XmQuestion.class,params);
List<Map<String,Object>> datas = xmQuestionService.selectListByWhere(page,qw,params); //列出XmQuestion列表
return Result.ok().setData(datas).setTotal(page.getTotal());
}
@ -137,36 +138,33 @@ public class XmQuestionController {
@RequestMapping(value="/getXmQuestionAttDist",method=RequestMethod.GET)
public Result getXmQuestionAttDist(@ApiIgnore @RequestParam Map<String,Object> params){
User user=LoginUtils.getCurrentUserInfo();
xmQuestion.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAttDist(xmQuestion);
params.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAttDist(params);
return ResponseHelper.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmQuestionAgeDist",method=RequestMethod.GET)
public Result getXmQuestionAgeDist(@ApiIgnore @RequestParam Map<String,Object> params){
User user=LoginUtils.getCurrentUserInfo();
xmQuestion.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAgeDist(xmQuestion);
params.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAgeDist(params);
return ResponseHelper.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmQuestionRetestDist",method=RequestMethod.GET)
public Result getXmQuestionRetestDist(@ApiIgnore @RequestParam Map<String,Object> params){
User user=LoginUtils.getCurrentUserInfo();
xmQuestion.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionRetestDist(xmQuestion);
params.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionRetestDist(params);
return ResponseHelper.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmQuestionSort",method=RequestMethod.GET)
public Result getXmQuestionSort(@ApiIgnore @RequestParam Map<String,Object> params){
User user=LoginUtils.getCurrentUserInfo();
IPage page=QueryTools.initPage(params);
xmQuestion.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionSort(xmQuestion);
params.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionSort(params);
Map<String,Object> m=new HashMap<>();
PageUtils.responePage(m,datas);
return Result.ok().setData(datas).setTotal(page.getTotal());
}
@ApiOperation( value = "新增一条xm_question信息",notes="addXmQuestion,主键如果为空,后台自动生成")
@ -204,10 +202,8 @@ public class XmQuestionController {
if(words!=null && words.size()>0){
return Result.error("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
}
tips=checkOneQx(xmQuestionVo.getProjectId(),xmQuestionVo.getProductId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=checkOneQx(xmQuestionVo.getProjectId(),xmQuestionVo.getProductId());
Result.assertIsFalse(tips);
if(StringUtils.hasText(xmQuestionVo.getProjectId())){
XmProject xmProject=projectService.getProjectFromCache(xmQuestionVo.getProjectId() );
xmQuestionVo.setPbranchId(xmProject.getBranchId());
@ -278,10 +274,8 @@ public class XmQuestionController {
}
XmQuestion xmQuestionDb=this.xmQuestionService.selectOneById(xmQuestion.getId());
tips=checkOneQx(xmQuestionDb.getProjectId(),xmQuestionDb.getProductId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=checkOneQx(xmQuestionDb.getProjectId(),xmQuestionDb.getProductId());
Result.assertIsFalse(tips);
User user=LoginUtils.getCurrentUserInfo();
xmQuestionService.updateSomeFieldByPk(xmQuestion);
if(!StringUtils.isEmpty(xmQuestion.getHandlerUserid())) {

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

@ -1,9 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.xm.core.entity.XmQuestionHandle;
@ -76,7 +75,7 @@ public class XmQuestionHandleController {
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmQuestionHandle> qw = QueryTools.initQueryWrapper(XmQuestionHandle.class , params);
List<Map<String,Object>> datas = xmQuestionHandleService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmQuestionHandle列表

141
xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java

@ -1,141 +0,0 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.xm.core.entity.XmQuestionTag;
import com.xm.core.service.XmQuestionTagService;
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.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import java.util.Map;
/**
* url编制采用rest风格,如对XM.xm_question_tag 问题标签关联表的操作有增删改查,对应的url分别为:<br>
* 新增: xm/xmQuestionTag/add <br>
* 查询: xm/xmQuestionTag/list<br>
* 模糊查询: xm/xmQuestionTag/listKey<br>
* 修改: xm/xmQuestionTag/edit <br>
* 删除: xm/xmQuestionTag/del<br>
* 批量删除: xm/xmQuestionTag/batchDel<br>
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 实体 XmQuestionTag XM.xm_question_tag 当前主键(包括多主键): id;
***/
@RestController("xm.core.xmQuestionTagController")
@RequestMapping(value="/**/xm/core/xmQuestionTag")
@Api(tags={"问题标签关联表操作接口"})
public class XmQuestionTagController {
static Log logger=LogFactory.getLog(XmQuestionTagController.class);
@Autowired
private XmQuestionTagService xmQuestionTagService;
@ApiOperation( value = "查询问题标签关联表信息列表",notes="listXmQuestionTag,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@ApiImplicitParams({
@ApiImplicitParam(name="id",value="主键,主键",required=false),
@ApiImplicitParam(name="questionId",value="问题编号",required=false),
@ApiImplicitParam(name="tagId",value="标签编号",required=false),
@ApiImplicitParam(name="tagName",value="标签名称",required=false),
@ApiImplicitParam(name="ctime",value="添加时间",required=false),
@ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
@ApiImplicitParam(name="pageNum",value="当前页码,从1开始",required=false),
@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时,会自动计算总记录数,如果上传>0的不自动计算",required=false),
@ApiImplicitParam(name="orderBy",value="排序列 如性别、学生编号排序 orderBy = sex desc,student_id desc",required=false),
@ApiImplicitParam(name="count",value="是否进行总条数计算,count=true|false",required=false)
})
@ApiResponses({
@ApiResponse(code = 200,response= XmQuestionTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Result listXmQuestionTag(@ApiIgnore @RequestParam Map<String,Object> params){
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
List<Map<String,Object>> datas = xmQuestionTagService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmQuestionTag列表
}
/**
@ApiOperation( value = "新增一条问题标签关联表信息",notes="addXmQuestionTag,主键如果为空,后台自动生成")
@ApiResponses({
@ApiResponse(code = 200,response=XmQuestionTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/add",method=RequestMethod.POST)
public Result addXmQuestionTag(@RequestBody XmQuestionTag xmQuestionTag) {
if(StringUtils.isEmpty(xmQuestionTag.getId())) {
xmQuestionTag.setId(xmQuestionTagService.createKey("id"));
}else{
XmQuestionTag xmQuestionTagQuery = new XmQuestionTag(xmQuestionTag.getId());
if(xmQuestionTagService.countByWhere(xmQuestionTagQuery)>0){
return Result.error("编号重复,请修改编号再提交");
}
}
xmQuestionTagService.insert(xmQuestionTag);
}
*/
/**
@ApiOperation( value = "删除一条问题标签关联表信息",notes="delXmQuestionTag,仅需要上传主键字段")
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
})
@RequestMapping(value="/del",method=RequestMethod.POST)
public Result delXmQuestionTag(@RequestBody XmQuestionTag xmQuestionTag){
xmQuestionTagService.deleteByPk(xmQuestionTag);
return Result.ok();
}
*/
/**
@ApiOperation( value = "根据主键修改一条问题标签关联表信息",notes="editXmQuestionTag")
@ApiResponses({
@ApiResponse(code = 200,response=XmQuestionTag.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/edit",method=RequestMethod.POST)
public Result editXmQuestionTag(@RequestBody XmQuestionTag xmQuestionTag) {
xmQuestionTagService.updateByPk(xmQuestionTag);
}
*/
/**
@ApiOperation( value = "根据主键列表批量删除问题标签关联表信息",notes="batchDelXmQuestionTag,仅需要上传主键字段")
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
@RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Result batchDelXmQuestionTag(@RequestBody List<XmQuestionTag> xmQuestionTags) {
xmQuestionTagService.batchDelete(xmQuestionTags);
return Result.ok();
}
*/
}

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

@ -1,5 +1,6 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.query.QueryTools;
@ -73,7 +74,7 @@ public class XmRecordController {
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmRecord> qw = QueryTools.initQueryWrapper(XmRecord.class , params);
List<Map<String,Object>> datas = xmRecordService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmRecord列表

273
xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java

@ -1,273 +0,0 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.core.utils.ResponseHelper;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmRecordVisit;
import com.xm.core.service.XmRecordVisitService;
import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.mdp.core.utils.BaseUtils.toMap;
/**
* url编制采用rest风格,如对xm_record_visit 重要页面访问记录的操作有增删改查,对应的url分别为:<br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmRecordVisit xm_record_visit 当前主键(包括多主键): id;
***/
@RestController("xm.core.xmRecordVisitController")
@RequestMapping(value="/**/core/xmRecordVisit")
@Api(tags={"重要页面访问记录操作接口"})
public class XmRecordVisitController {
static Logger logger =LoggerFactory.getLogger(XmRecordVisitController.class);
@Autowired
private XmRecordVisitService xmRecordVisitService;
List<XmRecordVisit> datas=new ArrayList<>();
Map<String,Object> fieldsMap = toMap(new XmRecordVisit());
@ApiOperation( value = "查询重要页面访问记录信息列表",notes=" ")
@ApiEntityParams( XmRecordVisit.class )
@ApiImplicitParams({
@ApiImplicitParam(name="pageSize",value="每页大小,默认20条",required=false),
@ApiImplicitParam(name="pageNum",value="当前页码,从1开始",required=false),
@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时,会自动计算总记录数,如果上传>0的不自动计算",required=false),
@ApiImplicitParam(name="count",value="是否计算总记录条数,如果count=true,则计算计算总条数,如果count=false 则不计算",required=false),
@ApiImplicitParam(name="orderBy",value="排序列 如性别、学生编号排序 orderBy = sex desc,student desc",required=false),
})
@ApiResponses({
@ApiResponse(code = 200,response=XmRecordVisit.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Result listXmRecordVisit(@ApiIgnore @RequestParam Map<String,Object> params){
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
List<Map<String,Object>> datas = xmRecordVisitService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmRecordVisit列表
}
@ApiOperation( value = "新增一条重要页面访问记录信息",notes=" ")
@ApiResponses({
@ApiResponse(code = 200,response=XmRecordVisit.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/add",method=RequestMethod.POST)
public Result addXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit) {
if(!StringUtils.hasText(xmRecordVisit.getBizId())){
return ResponseHelper.failed("bizId-0","bizId不能为空");
}
if(!StringUtils.hasText(xmRecordVisit.getPbizId())){
return ResponseHelper.failed("pbizId-0","pbizId不能为空");
}
if(!StringUtils.hasText(xmRecordVisit.getObjType())){
return ResponseHelper.failed("objType-0","objType不能为空");
}
User user= LoginUtils.getCurrentUserInfo();
xmRecordVisit.setId(this.xmRecordVisitService.createKey("id"));
xmRecordVisit.setGloNo(MDC.get("gloNo"));
xmRecordVisit.setOperTime(new Date());
xmRecordVisit.setOperUserid(user.getUserid());
xmRecordVisit.setOperUsername(user.getUsername());
xmRecordVisit.setBranchId(user.getBranchId());
xmRecordVisit.setIp(RequestUtils.getIpAddr(RequestUtils.getRequest()));
this.datas.add(xmRecordVisit);
if(this.datas.size()>100){
List<XmRecordVisit> newDatas=new ArrayList<>();
newDatas.addAll(this.datas);
this.datas.clear();
xmRecordVisitService.batchAddAndCalc(newDatas);
}
//
return Result.ok();
}
@Scheduled(cron = "0 0 */3 * * ?")
public void batchAddAndCalc(){
if(this.datas.size()>0){
List<XmRecordVisit> newDatas=new ArrayList<>();
newDatas.addAll(this.datas);
this.datas.clear();
xmRecordVisitService.batchAddAndCalc(newDatas);
}
}
/**
@ApiOperation( value = "删除一条重要页面访问记录信息",notes=" ")
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
})
@RequestMapping(value="/del",method=RequestMethod.POST)
public Result delXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit){
if(!StringUtils.hasText(xmRecordVisit.getId())) {
return Result.error("pk-not-exists","请上送主键参数id");
}
XmRecordVisit xmRecordVisitDb = xmRecordVisitService.selectOneObject(xmRecordVisit);
if( xmRecordVisitDb == null ){
return Result.error("data-not-exists","数据不存在,无法删除");
}
xmRecordVisitService.deleteByPk(xmRecordVisit);
return Result.ok();
}
*/
/**
@ApiOperation( value = "根据主键修改一条重要页面访问记录信息",notes=" ")
@ApiResponses({
@ApiResponse(code = 200,response=XmRecordVisit.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/edit",method=RequestMethod.POST)
public Result editXmRecordVisit(@RequestBody XmRecordVisit xmRecordVisit) {
if(!StringUtils.hasText(xmRecordVisit.getId())) {
return Result.error("pk-not-exists","请上送主键参数id");
}
XmRecordVisit xmRecordVisitDb = xmRecordVisitService.selectOneObject(xmRecordVisit);
if( xmRecordVisitDb == null ){
return Result.error("data-not-exists","数据不存在,无法修改");
}
xmRecordVisitService.updateSomeFieldByPk(xmRecordVisit);
}
*/
/**
@ApiOperation( value = "批量修改某些字段",notes="")
@ApiEntityParams( value = XmRecordVisit.class, props={ }, remark = "重要页面访问记录", paramType = "body" )
@ApiResponses({
@ApiResponse(code = 200,response=XmRecordVisit.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
public Result editSomeFields( @ApiIgnore @RequestBody Map<String,Object> xmRecordVisitMap) {
List<String> ids= (List<String>) xmRecordVisitMap.get("ids");
if(ids==null || ids.size()==0){
return Result.error("ids-0","ids不能为空");
}
Set<String> fields=new HashSet<>();
fields.add("id");
for (String fieldName : xmRecordVisitMap.keySet()) {
if(fields.contains(fieldName)){
return Result.error(fieldName+"-no-edit",fieldName+"不允许修改");
}
}
Set<String> fieldKey=xmRecordVisitMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet());
fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmRecordVisitMap.get(i) )).collect(Collectors.toSet());
if(fieldKey.size()<=0) {
return Result.error("fieldKey-0","没有需要更新的字段");
}
XmRecordVisit xmRecordVisit = fromMap(xmRecordVisitMap,XmRecordVisit.class);
List<XmRecordVisit> xmRecordVisitsDb=xmRecordVisitService.selectListByIds(ids);
if(xmRecordVisitsDb==null ||xmRecordVisitsDb.size()==0){
return Result.error("data-0","记录已不存在");
}
List<XmRecordVisit> can=new ArrayList<>();
List<XmRecordVisit> no=new ArrayList<>();
User user = LoginUtils.getCurrentUserInfo();
for (XmRecordVisit xmRecordVisitDb : xmRecordVisitsDb) {
Tips tips2 = new Tips("检查通过");
if(!tips2.isOk()){
no.add(xmRecordVisitDb);
}else{
can.add(xmRecordVisitDb);
}
}
if(can.size()>0){
xmRecordVisitMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList()));
xmRecordVisitService.editSomeFields(xmRecordVisitMap);
}
List<String> msgs=new ArrayList<>();
if(can.size()>0){
msgs.add(String.format("成功更新以下%s条数据",can.size()));
}
if(no.size()>0){
msgs.add(String.format("以下%s个数据无权限更新",no.size()));
}
if(can.size()>0){
return Result.ok(msgs.stream().collect(Collectors.joining()));
}else {
return Result.error(msgs.stream().collect(Collectors.joining()));
}
}
*/
/**
@ApiOperation( value = "根据主键列表批量删除重要页面访问记录信息",notes=" ")
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
@RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Result batchDelXmRecordVisit(@RequestBody List<XmRecordVisit> xmRecordVisits) {
if(xmRecordVisits.size()<=0){
return Result.error("data-0","请上送待删除数据列表");
}
List<XmRecordVisit> datasDb=xmRecordVisitService.selectListByIds(xmRecordVisits.stream().map(i-> i.getId() ).collect(Collectors.toList()));
List<XmRecordVisit> can=new ArrayList<>();
List<XmRecordVisit> no=new ArrayList<>();
for (XmRecordVisit data : datasDb) {
if(true){
can.add(data);
}else{
no.add(data);
}
}
List<String> msgs=new ArrayList<>();
if(can.size()>0){
xmRecordVisitService.batchDelete(can);
msgs.add(String.format("成功删除%s条数据.",can.size()));
}
if(no.size()>0){
msgs.add(String.format("以下%s条数据不能删除.【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(","))));
}
if(can.size()>0){
return Result.ok(msgs.stream().collect(Collectors.joining()));
}else {
return Result.error(msgs.stream().collect(Collectors.joining()));
}
}
*/
}

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

@ -1,9 +1,9 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
@ -24,7 +24,6 @@ import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.fromMap;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_rpt_config 测试报告配置表的操作有增删改查,对应的url分别为:<br>
@ -65,7 +64,7 @@ public class XmRptConfigController {
IPage page=QueryTools.initPage(params);
User user=LoginUtils.getCurrentUserInfo();
params.put("cbranchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmRptConfig> qw = QueryTools.initQueryWrapper(XmRptConfig.class , params);
List<Map<String,Object>> datas = xmRptConfigService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmRptConfig列表

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

@ -1,9 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.DateUtils;
import com.mdp.core.utils.RequestUtils;
@ -27,7 +26,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_rpt_data xm_rpt_data的操作有增删改查,对应的url分别为:<br>
@ -68,7 +66,7 @@ public class XmRptDataController {
IPage page=QueryTools.initPage(params);
User user=LoginUtils.getCurrentUserInfo();
params.put("cbranchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmRptData> qw = QueryTools.initQueryWrapper(XmRptData.class , params);
List<Map<String,Object>> datas = xmRptDataService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmRptData列表

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

@ -1,9 +1,9 @@
package com.xm.core.ctrl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.NumberUtil;
@ -37,7 +37,6 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_task_bid_order 任务相关费用订单表的操作有增删改查,对应的url分别为:<br>
@ -91,7 +90,7 @@ public class XmTaskBidOrderController {
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTaskBidOrder> qw = QueryTools.initQueryWrapper(XmTaskBidOrder.class , params);
List<Map<String,Object>> datas = xmTaskBidOrderService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTaskBidOrder列表

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

@ -1,6 +1,7 @@
package com.xm.core.ctrl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.audit.log.client.annotation.AuditLog;
import com.mdp.audit.log.client.annotation.OperType;
@ -39,7 +40,6 @@ import java.util.*;
import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.map;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对XM.xm_task xm_task的操作有增删改查,对应的url分别为:<br>
@ -144,7 +144,7 @@ public class XmTaskController {
params.put("compete",user.getUserid());
}
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTask> qw = QueryTools.initQueryWrapper(XmTask.class , params);
List<Map<String,Object>> datas = xmTaskService.getTask(params); //列出XmTask列表
if("1".equals(params.get("withParents")) && !"1".equals(params.get("isTop"))&& datas.size()>0){
Set<String> pidPathsSet=new HashSet<>();
@ -186,33 +186,31 @@ public class XmTaskController {
@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/getOutTask",method=RequestMethod.GET)
public Result getOutTask(@ApiIgnore @RequestParam Map<String,Object> xmTask){
public Result getOutTask(@ApiIgnore @RequestParam Map<String,Object> params){
RequestUtils.transformArray(params, "skillIds");
IPage page=QueryTools.initPage(params);
xmTask.put("taskOut","1");
xmTask.put("ntype","0");
xmTask.put("toTaskCenter","1");
List<Map<String,Object>> tasks=xmTaskService.getTask(xmTask);
PageUtils.responePage(m,tasks);
params.put("taskOut","1");
params.put("ntype","0");
params.put("toTaskCenter","1");
List<Map<String,Object>> datas=xmTaskService.getTask(params);
return Result.ok().setData(datas).setTotal(page.getTotal());
}
@RequestMapping(value="/getXmTaskAttDist",method=RequestMethod.GET)
public Result getXmTaskAttDist(@ApiIgnore @RequestParam Map<String,Object> params){
User user=LoginUtils.getCurrentUserInfo();
xmTask.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAttDist(xmTask);
params.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAttDist(params);
return ResponseHelper.ok("ok","成功",datas);
}
@RequestMapping(value="/getXmTaskAgeDist",method=RequestMethod.GET)
public Result getXmTaskAgeDist(@ApiIgnore @RequestParam Map<String,Object> params){
User user=LoginUtils.getCurrentUserInfo();
xmTask.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(xmTask);
params.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(params);
return ResponseHelper.ok("ok","成功",datas);
}
@ -242,11 +240,9 @@ public class XmTaskController {
public Result getXmTaskSort(@ApiIgnore @RequestParam Map<String,Object> params){
User user=LoginUtils.getCurrentUserInfo();
IPage page=QueryTools.initPage(params);
xmTask.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskSort(xmTask);
Map<String,Object> m=new HashMap<>();
PageUtils.responePage(m,datas);
params.put("pbranchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskSort(params);
return Result.ok().setData(datas).setTotal(page.getTotal());
}
@ -361,7 +357,7 @@ public class XmTaskController {
if(groupService.checkUserIsProjectAdm(xmProject,user.getUserid())){
can.add(xmTaskDb);
}else{
tips=projectQxService.checkProjectQx(xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
Tips tips=projectQxService.checkProjectQx(xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId());
if(!tips.isOk()){
no.add(xmTaskDb);
}else{
@ -382,9 +378,9 @@ public class XmTaskController {
}
if("1".equals(xmProject.getBudgetCtrl())){
if(taskDb.getLvl()<=1){
tips=this.xmTaskService.judgetProjectBudget(taskDb.getProjectId(),budgetAt,Arrays.asList(taskDb.getId()));
Tips tips=this.xmTaskService.judgetProjectBudget(taskDb.getProjectId(),budgetAt,Arrays.asList(taskDb.getId()));
}else {
tips=this.xmTaskService.judgetTaskBudget(taskDb.getParentTaskid(),budgetAt,null,null,null,Arrays.asList(taskDb.getId()));
Tips tips=this.xmTaskService.judgetTaskBudget(taskDb.getParentTaskid(),budgetAt,null,null,null,Arrays.asList(taskDb.getId()));
}
if(!tips.isOk()){
return ResponseHelper.failed(tips);
@ -617,40 +613,39 @@ public class XmTaskController {
XmTask xmTaskQuery = new XmTask(xmTaskVo.getId());
if(this.xmTaskService.countByWhere(xmTaskQuery)>0){
return Result.error("编号重复,请修改编号再提交");
throw new BizException(tips);
}
}
this.xmTaskService.parentIdPathsCalcBeforeSave(xmTaskVo);
if("1".equals(xmProject.getBudgetCtrl())){
if(xmTaskVo.getBudgetAt()!=null && xmTaskVo.getBudgetAt().compareTo(BigDecimal.ZERO)>0){
if(xmTaskVo.getLvl()<=1){
tips=xmTaskService.judgetProjectBudget(xmTaskVo.getProjectId(),xmTaskVo.getBudgetAt(),null);
Tips tips=xmTaskService.judgetProjectBudget(xmTaskVo.getProjectId(),xmTaskVo.getBudgetAt(),null);
Result.assertIsFalse(tips);
}else{
tips=xmTaskService.judgetTaskBudget(xmTaskVo.getParentTaskid(), xmTaskVo.getBudgetAt(),null,null,null,null);
Tips tips=xmTaskService.judgetTaskBudget(xmTaskVo.getParentTaskid(), xmTaskVo.getBudgetAt(),null,null,null,null);
Result.assertIsFalse(tips);
}
}
}
if(tips.isOk()) {
//新增任务技能
if(xmTaskVo.getSkills()!=null && xmTaskVo.getSkills().size()>0){
for (XmTaskSkill skill : xmTaskVo.getSkills()) {
if(!StringUtils.hasText(skill.getSkillId())){
return ResponseHelper.failed("skillId-0","标签编号不能为空");
}
if(!StringUtils.hasText(skill.getSkillName())){
return ResponseHelper.failed("skillName-0","标签名称不能为空");
}
/**
* 这个不控制
if(!StringUtils.hasText(skill.getCategoryId())){
return ResponseHelper.failed("categoryId-0","标签分类不能为空");
}
*/
//新增任务技能
if(xmTaskVo.getSkills()!=null && xmTaskVo.getSkills().size()>0){
for (XmTaskSkill skill : xmTaskVo.getSkills()) {
if(!StringUtils.hasText(skill.getSkillId())){
return ResponseHelper.failed("skillId-0","标签编号不能为空");
}
if(!StringUtils.hasText(skill.getSkillName())){
return ResponseHelper.failed("skillName-0","标签名称不能为空");
}
/**
* 这个不控制
if(!StringUtils.hasText(skill.getCategoryId())){
return ResponseHelper.failed("categoryId-0","标签分类不能为空");
}
*/
}
xmTaskVo = xmTaskService.addTask(xmTaskVo);
}
xmTaskVo = xmTaskService.addTask(xmTaskVo);
return Result.ok();
@ -671,23 +666,23 @@ public class XmTaskController {
@ApiResponse(code = 200,response=XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
})
@RequestMapping(value="/list",method=RequestMethod.GET)
public Result listXmTask(@ApiIgnore @RequestParam Map<String,Object> xmTask){
public Result listXmTask(@ApiIgnore @RequestParam Map<String,Object> params){
RequestUtils.transformArray(params, "ids");
RequestUtils.transformArray(params, "tagIdList");
IPage page=QueryTools.initPage(params);
String taskOut= (String) xmTask.get("taskOut");
String taskOut= (String) params.get("taskOut");
if(!"1".equals(taskOut)){
String projectId= (String) xmTask.get("projectId");
String userid= (String) xmTask.get("userid");
String projectId= (String) params.get("projectId");
String userid= (String) params.get("userid");
if( !(StringUtils.hasText(projectId) || StringUtils.hasText(userid) ) ){
User user = LoginUtils.getCurrentUserInfo();
xmTask.put("cbranchId",user.getBranchId());
params.put("cbranchId",user.getBranchId());
}
}
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
List<Map<String,Object>> datas = xmTaskService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTask列表
}
@ -818,9 +813,9 @@ public class XmTaskController {
excludeIds.add(xmTaskDb.getId());
if( "1".equals(xmProject.getBudgetCtrl()) && xmTaskDb.getBudgetAt().compareTo(xmTaskVo.getBudgetAt())!=0){
if(xmTaskVo.getLvl()<=1){
tips=xmTaskService.judgetProjectBudget(xmTaskDb.getProjectId(), xmTaskVo.getBudgetAt(),excludeIds);
Tips tips=xmTaskService.judgetProjectBudget(xmTaskDb.getProjectId(), xmTaskVo.getBudgetAt(),excludeIds);
}else if(StringUtils.hasText(xmTaskDb.getParentTaskid())){
tips=xmTaskService.judgetTaskBudget(xmTaskDb.getParentTaskid(), xmTaskVo.getBudgetAt(),null,null,null,excludeIds);
Tips tips=xmTaskService.judgetTaskBudget(xmTaskDb.getParentTaskid(), xmTaskVo.getBudgetAt(),null,null,null,excludeIds);
}
}
@ -862,40 +857,6 @@ public class XmTaskController {
return Result.ok();
}
/**不允许直接改进度通过报工形式改进度
@ApiOperation( value = "根据主键修改一条任务信息",notes="editXmTask")
@ApiResponses({
@ApiResponse(code = 200,response=XmTask.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
//@HasQx(value = "xm_core_xmTask_editProgress",name = "修改任务进度百分比",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
@RequestMapping(value="/editProgress",method=RequestMethod.POST)
public Result editProgress(@RequestBody XmTask xmTask) {
User user=LoginUtils.getCurrentUserInfo();
if(!StringUtils.hasText(xmTask.getId())){
return Result.error("任务编号不能为空");
}
XmTask xmTaskDb=xmTaskService.selectOneObject(xmTask);
if(xmTaskDb==null){
return ResponseHelper.failed("data-0","任务已不存在");
}
tips=groupService.checkIsAdmOrTeamHeadOrAssByPtype(user,user.getUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId());
if(!tips.isOk()){
boolean isCreateUser=user.getUserid().equals(xmTaskDb.getCreateUserid());
boolean isExecUser=user.getUserid().equals(xmTaskDb.getExecutorUserid());
if( !isCreateUser && !isExecUser ){
return ResponseHelper.failed("no-qx-op","您无权修改该任务的进度!只有任务执行人、任务负责人、组长、项目经理可以修改任务的进度。");
}
}
xmTaskService.updateProgress(xmTask,xmTaskDb);
return Result.ok();
}
**/
@ApiOperation( value = "批量导入任务-从模板导入",notes="batchDelXmTask,仅需要上传主键字段")
@ApiResponses({
@ -987,7 +948,7 @@ public class XmTaskController {
totalTaskBudgetAt=totalTaskBudgetAt.add(task.getBudgetAt());
}
if("0".equals(batchImportVo.getPtype())&&totalTaskBudgetAt.compareTo(BigDecimal.ZERO)>0){
tips=xmTaskService.judgetProjectBudget(projectId,totalTaskBudgetAt,tasksLvl1.stream().map(i->i.getId()).collect(Collectors.toList()));
Tips tips=xmTaskService.judgetProjectBudget(projectId,totalTaskBudgetAt,tasksLvl1.stream().map(i->i.getId()).collect(Collectors.toList()));
if(!tips.isOk()){
return Result.error(tips.getMsg()+" 相关任务【"+tasksLvl1.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
return ResponseHelper.failed(tips);
@ -1005,7 +966,7 @@ public class XmTaskController {
childBudgetAt=childBudgetAt.add(child.getBudgetAt());
}
if(childBudgetAt.compareTo(BigDecimal.ZERO)>0){
tips= xmTaskService.judgetTaskBudget(pid,childBudgetAt,null,null,null,childs.stream().map(i->i.getId()).collect(Collectors.toList()));
Tips tips= xmTaskService.judgetTaskBudget(pid,childBudgetAt,null,null,null,childs.stream().map(i->i.getId()).collect(Collectors.toList()));
if(!tips.isOk()){
return ResponseHelper.failed("budget-not-enought",tips.getMsg()+" 相关任务【"+childs.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
}
@ -1037,7 +998,7 @@ public class XmTaskController {
}
}
return Result.ok();
}
/**
@ -1327,153 +1288,9 @@ public class XmTaskController {
}else{
return Result.ok(msgs.stream().collect(Collectors.joining(" ")));
}
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
}
/**
@ApiOperation( value = "批量修改预算",notes="batchSaveBudget,仅需要上传主键字段")
@ApiResponses({
@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
})
//@HasQx(value = "xm_core_xmTask_batchSaveBudget",name = "批量修改任务预算",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
@RequestMapping(value="/batchSaveBudget",method=RequestMethod.POST)
public Result batchSaveBudget(@RequestBody List<XmTask> xmTasks) {
User user=LoginUtils.getCurrentUserInfo();
if(xmTasks==null || xmTasks.size()==0){
return Result.error("任务列表不能为空");
}
Map<String,XmTask> xmTaskDbMap=this.xmTaskService.selectTasksMapByTasks(xmTasks);
XmTask xmTaskDb=xmTaskDbMap.values().stream().findFirst().isPresent()?xmTaskDbMap.values().stream().findFirst().get():null;
if(xmTaskDb==null){
return ResponseHelper.failed("data-0","任务不存在");
}
Tips tips2=this.groupService.checkIsAdmOrTeamHeadOrAssByPtype(user,user.getUserid(),xmTaskDb.getPtype(),xmTaskDb.getProductId(),xmTaskDb.getProjectId());
if(!tips2.isOk()){
return ResponseHelper.failed(tips2);
}
Map<String,XmTask> allowTasksDbMap=new HashMap<>();
Map<String,XmTask> noAllowTasksDbMap=new HashMap<>();
Map<String,XmTask> frontParamsTaskMap=new HashMap<>();
List<XmTask> insertTasks=new ArrayList<>();
List<XmTask> updateTasks=new ArrayList<>();
for (XmTask task : xmTasks) {
if( "0".equals(xmTaskDb.getPtype()) && !xmTaskDb.getProjectId().equals(task.getProjectId()) ){
return ResponseHelper.failed("not-same-projectId","所有任务必须同属于一个项目");
}
if( "1".equals(xmTaskDb.getPtype()) && !xmTaskDb.getProductId().equals(task.getProductId()) ){
return ResponseHelper.failed("not-same-productId","所有任务必须同属于一个产品");
}
if(task.getBudgetAt()==null){
task.setBudgetAt(BigDecimal.ZERO);
}
if(task.getBudgetWorkload()==null){
task.setBudgetWorkload(BigDecimal.ZERO);
}
frontParamsTaskMap.put(task.getId(),task);
if(xmTaskDbMap.containsKey(task.getId())){
task.setLtime(new Date());
updateTasks.add(task);
}else {
task.setCreateUsername(user.getUsername());
task.setCreateUserid(user.getUserid());
task.setExecutorUserid(user.getUserid());
task.setExecutorUsername(user.getUsername());
task.setCreateTime(new Date());
task.setLtime(new Date());
insertTasks.add(task);
}
}
List<XmGroupVo> pgroups=new ArrayList<>();
if("0".equals(xmTaskDb.getPtype())){
pgroups=groupService.getProjectGroupVoList(xmTaskDb.getProjectId());
}else{
pgroups=groupService.getProductGroupVoList(xmTaskDb.getProductId());
}
for (XmTask task : xmTaskDbMap.values()) {
boolean isHead=groupService.checkUserIsOtherUserTeamHeadOrAss(pgroups,user.getUserid(),task.getCreateUserid());
if(!isHead){
noAllowTasksDbMap.put(task.getId(),task);
}else {
allowTasksDbMap.put(task.getId(),task);
}
}
List<XmTask> canOpTasks=xmTasks.stream().filter(i->!noAllowTasksDbMap.containsKey(i.getId())).collect(Collectors.toList());
this.xmTaskService.parentIdPathsCalcBeforeSave(canOpTasks);
List<XmTask> tasksLvl1=canOpTasks.stream().filter(i->i.getLvl()<=1).collect(Collectors.toList());
if(tasksLvl1.size()>0){
BigDecimal totalTaskBudgetAt=BigDecimal.ZERO;
for (XmTask task : tasksLvl1) {
totalTaskBudgetAt=totalTaskBudgetAt.add(task.getBudgetAt());
}
if("0".equals(xmTaskDb.getPtype()) && totalTaskBudgetAt.compareTo(BigDecimal.ZERO)>0){
tips=xmTaskService.judgetProjectBudget(xmTaskDb.getProjectId(),totalTaskBudgetAt,tasksLvl1.stream().map(i->i.getId()).collect(Collectors.toList()));
if(!tips.isOk()){
return Result.error(tips.getMsg()+" 相关任务【"+tasksLvl1.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
return ResponseHelper.failed(tips);
}
}
}
Map<String,List<XmTask>> map=new HashMap<>();
for (XmTask canOpTask : canOpTasks) {
if(!StringUtils.hasText(canOpTask.getParentTaskid())||canOpTask.getParentTaskid().equals("0")){
continue;
}
List<XmTask> childs=map.get(canOpTask.getParentTaskid());
if(childs==null){
childs=new ArrayList<>();
}
childs.add(canOpTask);
map.put(canOpTask.getParentTaskid(),childs);
}
for (Map.Entry<String, List<XmTask>> kv : map.entrySet()) {
BigDecimal childBudgetAt = BigDecimal.ZERO;
List<XmTask> childs = kv.getValue();
for (XmTask child : childs) {
childBudgetAt = childBudgetAt.add(child.getBudgetAt());
}
if (childBudgetAt.compareTo(BigDecimal.ZERO) > 0) {
tips = xmTaskService.judgetTaskBudget(kv.getKey(), childBudgetAt, null, null, null, childs.stream().map(i -> i.getId()).collect(Collectors.toList()));
if (!tips.isOk()) {
return ResponseHelper.failed("budget-not-enought", tips.getMsg() + " 相关任务【" + childs.stream().map(i -> i.getName()).collect(Collectors.joining(",")) + "】");
}
}
}
//过滤掉我没有权限的
List<XmTask> canUpdateTasks=canOpTasks.stream().filter(i->xmTaskDbMap.containsKey(i.getId())).collect(Collectors.toList());
List<XmTask> canInsertTasks=canOpTasks.stream().filter(i->!xmTaskDbMap.containsKey(i.getId())).collect(Collectors.toList());
xmTaskService.batchInsertOrUpdate(canInsertTasks,canUpdateTasks);
for (XmTask t : canUpdateTasks) {
xmRecordService.addXmTaskRecord(t.getProjectId(), t.getId(), "项目-任务-批量修改任务预算", "修改任务预算"+t.getName(),JSON.toJSONString(t),null);
}
for (XmTask t : canInsertTasks) {
xmRecordService.addXmTaskRecord(t.getProjectId(), t.getId(), "项目-任务-批量修改任务预算", "修改任务预算"+t.getName(),JSON.toJSONString(t),null);
}
if(canOpTasks.size()<=0){
return Result.error("成功修改0个任务。当前任务均无权限操作,只有组长助理、组长、项目助理、项目经理有权限批量修改预算。");
}else if(canOpTasks.size()==xmTasks.size()){
return Result.ok("成功修改"+canOpTasks.size()+"个任务。");
}else {
return Result.ok("成功修改"+canOpTasks.size()+"个任务。其中以下任务无权限修改。【"+noAllowTasksDbMap.values().stream().map(i->i.getName()).collect(Collectors.joining(","))+"】");
}
}
*/
/***/
@ApiOperation( value = "批量修改任务的上级",notes="batchChangeParentTask,仅需要上传主键字段")
@ -1587,8 +1404,6 @@ public class XmTaskController {
}else{
return Result.error(msgs.stream().collect(Collectors.joining(" ")));
}
return Result.ok();
}
/**
@ -1611,20 +1426,7 @@ public class XmTaskController {
@AuditLog(firstMenu="办公平台",secondMenu="项目任务管理",func="processApprova",funcDesc="任务审核",operType=OperType.UPDATE)
@RequestMapping(value="/processApprova",method=RequestMethod.POST)
public Result processApprova( @RequestBody Map<String,Object> flowVars){
this.xmTaskService.processApprova(flowVars);
logger.debug("procInstId====="+flowVars.get("procInstId"));
}catch (BizException e) {
tips=e.getTips();
logger.error("执行异常",e);
}catch (Exception e) {
return Result.error(e.getMessage());
logger.error("执行异常",e);
}
return Result.ok();
}
}

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

@ -1,9 +1,9 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
@ -27,7 +27,6 @@ import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.fromMap;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_task_eval xm_task_eval的操作有增删改查,对应的url分别为:<br>
@ -72,7 +71,7 @@ public class XmTaskEvalController {
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTaskEval> qw = QueryTools.initQueryWrapper(XmTaskEval.class , params);
List<Map<String,Object>> datas = xmTaskEvalService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTaskEval列表
@ -147,7 +146,7 @@ public class XmTaskEvalController {
xmTaskEval.setToUsername(toUser.getUsername());
xmTaskEval.setToBranchId(toUser.getBranchId());
xmTaskEvalService.insert(xmTaskEval);
return Result.ok();
}
@ApiOperation( value = "删除一条xm_task_eval信息",notes=" ")
@ -184,7 +183,7 @@ public class XmTaskEvalController {
return Result.error("data-not-exists","数据不存在,无法修改");
}
xmTaskEvalService.updateSomeFieldByPk(xmTaskEval);
return Result.ok();
}
@ApiOperation( value = "批量修改某些字段",notes="")

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

@ -1,5 +1,6 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
@ -13,10 +14,7 @@ import com.mdp.msg.client.PushNotifyMsgService;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmGroupUser;
import com.xm.core.entity.XmProject;
import com.xm.core.entity.XmTask;
import com.xm.core.entity.XmTaskExecuser;
import com.xm.core.entity.*;
import com.xm.core.service.*;
import com.xm.core.service.client.AcClient;
import com.xm.core.service.client.MkClient;
@ -123,7 +121,7 @@ public class XmTaskExecuserController {
}
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTaskExecuser> qw = QueryTools.initQueryWrapper(XmTaskExecuser.class , params);
List<Map<String,Object>> datas = xmTaskExecuserService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTaskExecuser列表
@ -206,10 +204,8 @@ public class XmTaskExecuserController {
xmTaskExecuser.setStatus("0"); //如果是众包智能添加为候选人
}else {
//如果不是众包需要判断是否已加入项目组组织架构中如未加入需要提示其先加入
tips=projectQxService.checkProjectQx(xmProjectDb,0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
if(!tips.isOk()){
return ResponseHelper.failed(tips);
};
Tips tips=projectQxService.checkProjectQx(xmProjectDb,0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
Result.assertIsFalse(tips);
//检查是否已经存在执行人
XmTaskExecuser query=new XmTaskExecuser();
query.setTaskId(xmTaskDb.getId());
@ -230,8 +226,7 @@ public class XmTaskExecuserController {
notifyMsgService.pushMsg(user, xmTaskDb.getCreateUserid(), xmTaskDb.getCreateUsername(), "2", xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "用户【"+xmTaskExecuser.getUsername()+"】投标任务【"+xmTaskDb.getName()+"】,请及时跟进!");
}
sysClient.pushBidsAfterBidSuccess(xmTaskExecuser.getUserid(),xmTaskDb.getId(),xmTaskDb.getBudgetAt(),xmTaskDb.getBudgetWorkload(),1);
return Result.ok();
}
@ApiOperation( value = "执行人离开任务",notes="editXmTaskExecuser")
@ -267,10 +262,8 @@ public class XmTaskExecuserController {
break;
}
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长任务责任人可以请别人请离开任务
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
if(!tips.isOk()){
return ResponseHelper.failed(tips);
};
Tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
Result.assertIsFalse(tips);
allowUsers.add(xmTaskExecuser);
allowUserNames.add(xmTaskExecuser.getUsername());
@ -279,9 +272,8 @@ public class XmTaskExecuserController {
allowUserNames.add(xmTaskExecuser.getUsername());
}
}
if(tips.isOk() && allowUsers.size()>0) {
if(allowUsers.size()>0) {
xmTaskExecuserService.batchLeave(allowUsers);
}
List<String> msgs=new ArrayList<>();
if(allowUsers.size()>0){
@ -297,7 +289,6 @@ public class XmTaskExecuserController {
}else{
return Result.error(msgs.stream().collect(Collectors.joining(" ")));
}
return Result.ok();
}
@ -333,53 +324,49 @@ public class XmTaskExecuserController {
return ResponseHelper.failed("project-0","项目已不存在");
}
tips=projectQxService.checkProjectQx(xmProject,2,user);
if(tips.isOk()) {
boolean exists=groupService.checkUserExistsGroup(pgroups, xmTaskExecuser.getUserid());
//如果还未加入项目组自动加入项目组
if(!exists) {
if(pgroups!=null && pgroups.size()>0){
XmGroupVo xg=pgroups.get(0);
XmGroupUser xmGroupUser=new XmGroupUser();
xmGroupUser.setGroupId(xg.getId());
xmGroupUser.setUsername(xmTaskExecuser.getUsername());
xmGroupUser.setUserid(xmTaskExecuser.getUserid());
xmGroupUser.setJoinTime(new Date());
xmGroupUser.setStatus("1");
xmGroupUser.setIsPri("1");
xmGroupUser.setObranchId(xmTaskExecuser.getExecUserBranchId());
this.xmGroupUserService.insert(xmGroupUser);
groupService.clearProjectGroup(projectId);
}else{
XmGroupVo xmGroupVo=new XmGroupVo();
xmGroupVo.setProjectId(projectId);
xmGroupVo.setAssUsername(user.getUsername());
xmGroupVo.setAssUserid(user.getUserid());
xmGroupVo.setBranchId(user.getBranchId());
xmGroupVo.setChildrenCnt(1);
xmGroupVo.setCtime(new Date());
xmGroupVo.setGroupName("默认管理小组");
XmGroupUser xmGroupUser=new XmGroupUser();
xmGroupUser.setUsername(xmTaskExecuser.getUsername());
xmGroupUser.setUserid(xmTaskExecuser.getUserid());
xmGroupUser.setJoinTime(new Date());
xmGroupUser.setStatus("1");
xmGroupUser.setIsPri("1");
xmGroupUser.setObranchId(xmTaskExecuser.getExecUserBranchId());
xmGroupVo.setGroupUsers(Arrays.asList(xmGroupUser));
groupService.addGroups(projectId,Arrays.asList(xmGroupVo));
}
//一个任务只能一个执行人
xmTaskExecuserService.becomeExecute(xmTask,xmTaskExecuser);
return Result.ok("变更成功");
//return Result.error("变更不成功,原因:候选人不在项目组中,请先将候选人加入项目团队中。");
}else {
xmTaskExecuserService.becomeExecute(xmTask,xmTaskExecuser);
return Result.ok("变更成功");
Tips tips=projectQxService.checkProjectQx(xmProject,2,user);
Result.assertIsFalse(tips);
boolean exists=groupService.checkUserExistsGroup(pgroups, xmTaskExecuser.getUserid());
//如果还未加入项目组自动加入项目组
if(!exists) {
if(pgroups!=null && pgroups.size()>0){
XmGroupVo xg=pgroups.get(0);
XmGroupUser xmGroupUser=new XmGroupUser();
xmGroupUser.setGroupId(xg.getId());
xmGroupUser.setUsername(xmTaskExecuser.getUsername());
xmGroupUser.setUserid(xmTaskExecuser.getUserid());
xmGroupUser.setJoinTime(new Date());
xmGroupUser.setStatus("1");
xmGroupUser.setIsPri("1");
xmGroupUser.setObranchId(xmTaskExecuser.getExecUserBranchId());
this.xmGroupUserService.insert(xmGroupUser);
groupService.clearProjectGroup(projectId);
}else{
XmGroupVo xmGroupVo=new XmGroupVo();
xmGroupVo.setProjectId(projectId);
xmGroupVo.setAssUsername(user.getUsername());
xmGroupVo.setAssUserid(user.getUserid());
xmGroupVo.setBranchId(user.getBranchId());
xmGroupVo.setChildrenCnt(1);
xmGroupVo.setCtime(new Date());
xmGroupVo.setGroupName("默认管理小组");
XmGroupUser xmGroupUser=new XmGroupUser();
xmGroupUser.setUsername(xmTaskExecuser.getUsername());
xmGroupUser.setUserid(xmTaskExecuser.getUserid());
xmGroupUser.setJoinTime(new Date());
xmGroupUser.setStatus("1");
xmGroupUser.setIsPri("1");
xmGroupUser.setObranchId(xmTaskExecuser.getExecUserBranchId());
xmGroupVo.setGroupUsers(Arrays.asList(xmGroupUser));
groupService.addGroups(projectId,Arrays.asList(xmGroupVo));
}
//一个任务只能一个执行人
xmTaskExecuserService.becomeExecute(xmTask,xmTaskExecuser);
return Result.ok("变更成功");
//return Result.error("变更不成功,原因:候选人不在项目组中,请先将候选人加入项目团队中。");
}else {
xmTaskExecuserService.becomeExecute(xmTask,xmTaskExecuser);
return Result.ok("变更成功");
}
return Result.ok();
@ -402,22 +389,17 @@ public class XmTaskExecuserController {
XmTask xmTaskDb= xmTaskService.selectOneById(taskId);
if(xmTaskDb==null ){
return Result.error("任务已不存在");
return ResponseHelper.failed(tips);
}
if("3".equals(xmTaskDb.getTaskState()) ||"4".equals(xmTaskDb.getTaskState()) || "9".equals(xmTaskDb.getTaskState())){
return Result.error("该任务已验收,不能重复验收");
return ResponseHelper.failed(tips);
}
User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskDb.getProjectId();
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user );
if(!tips.isOk()){
return ResponseHelper.failed(tips);
}
Tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user );
Result.assertIsFalse(tips);
boolean needPay=false;
if("1".equals(xmTaskDb.getCrowd())){
boolean isTaskCreater=user.getUserid().equals(xmTaskDb.getCreateUserid());
@ -463,9 +445,6 @@ public class XmTaskExecuserController {
notifyMsgService.pushMsg(user, xmTaskDb.getExecutorUserid(), xmTaskDb.getExecutorUsername(), "2", xmTaskDb.getProjectId(), xmTaskDb.getId(), "您执行的任务【" + xmTaskDb.getName() + "】已验收通过");
xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-验收任务", "验收任务【"+xmTaskDb.getName()+"】,验收通过。");
}
return Result.ok();
}
@ -495,20 +474,17 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
}
if(tips.isOk()) {
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid()));
if("0".equals(xmTaskExecuserDb.getStatus())) {
xmTaskExecuserService.quotePrice(xmTaskExecuser);
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), user.getUsername()+"修改任务【" + xmTask.getId() + "-" + xmTask.getName() + "】的报价信息,请尽快选标!");
Tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
Result.assertIsFalse(tips);
}
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid()));
if("0".equals(xmTaskExecuserDb.getStatus())) {
xmTaskExecuserService.quotePrice(xmTaskExecuser);
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), user.getUsername()+"修改任务【" + xmTask.getId() + "-" + xmTask.getName() + "】的报价信息,请尽快选标!");
}else {
return Result.error("只有修改处于候选状态的投标人的报价信息");
}
}else {
return Result.error("只有修改处于候选状态的投标人的报价信息");
}
return Result.ok();
@ -534,15 +510,13 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
}
if(tips.isOk()) {
xmTaskExecuserService.becomeCandidate(xmTaskExecuser);
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), user.getUsername()+"投标任务【" + xmTask.getId() + "-" + xmTask.getName() + "】,请尽快选标!");
Tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
Result.assertIsFalse(tips);
}
xmTaskExecuserService.becomeCandidate(xmTaskExecuser);
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), user.getUsername()+"投标任务【" + xmTask.getId() + "-" + xmTask.getName() + "】,请尽快选标!");
}
return Result.ok();
}
@ -569,7 +543,8 @@ public class XmTaskExecuserController {
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskDb.getId(),xmTaskExecuser.getUserid()));
if(xmTaskExecuserDb !=null ) {
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId());
Tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId());
Result.assertIsFalse(tips);
}
if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) {
xmTaskExecuserService.delete(xmTaskExecuser);
@ -584,8 +559,6 @@ public class XmTaskExecuserController {
else {
return Result.error("没有查到数据");
}
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
return Result.ok();
}
}

44
xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java

@ -1,8 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.NumberUtil;
@ -37,7 +37,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_task_order 任务相关费用订单表的操作有增删改查,对应的url分别为:<br>
@ -92,7 +91,7 @@ public class XmTaskOrderController {
RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTaskOrder> qw = QueryTools.initQueryWrapper(XmTaskOrder.class , params);
List<Map<String,Object>> datas = xmTaskOrderService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTaskOrder列表
@ -255,7 +254,7 @@ public class XmTaskOrderController {
}
msgService.pushMsg(user,user.getUserid(),user.getUsername(),"2",order.getProjectId(),order.getTaskId(),"您为任务支付"+remark+order.getFinalFee()+"元订单提交成功,请及时付款");
}
return Result.ok();
}
/**
@ -417,9 +416,7 @@ public class XmTaskOrderController {
return Result.error("data-0","订单Id不能为空");
}
XmTaskOrder moOrder = xmTaskOrderService.selectOneById(orderId);
m.put("tips", tips);
return m;
return Result.ok().setData(moOrder);
}
@ApiOperation( value = "通过Id获取订单",notes=" ")
@ -428,9 +425,7 @@ public class XmTaskOrderController {
})
@RequestMapping(value="/orderPaySuccess",method=RequestMethod.POST)
public Result orderPaySuccess(@RequestBody XmTaskOrder order) {
try {
if(!StringUtils.hasText(order.getId())) {
return Result.error("data-0","订单Id不能为空");
}
@ -439,16 +434,7 @@ public class XmTaskOrderController {
return Result.error("pay-notify-success-flag-0","验证码错误");
}
xmTaskOrderService.orderPaySuccess(order.getId(),order.getPayId(),order.getPrepayId(), order.getTranId(), order.getPayAt(), order.getRemark());
m.put("tips", tips);
return m;
}catch (BizException e) {
logger.error("",e);
return Result.error("data-0",e.getMessage());
} catch (Exception e) {
logger.error("",e);
return Result.error("data-0", "开通模块失败");
}
return Result.ok();
}
@ApiOperation( value = "订单支付取消判断",notes=" ")
@ -457,9 +443,7 @@ public class XmTaskOrderController {
})
@RequestMapping(value="/payCancel",method=RequestMethod.POST)
public Result payCancel(@RequestBody XmTaskOrder order) {
try {
if(!StringUtils.hasText(order.getId())) {
return Result.error("data-0","订单Id不能为空");
}
@ -468,15 +452,7 @@ public class XmTaskOrderController {
return Result.error("pay-notify-cancel-flag-0","验证码错误");
}
this.xmTaskOrderService.payCancel(order.getId(),order.getPayId(), order.getRemark());
m.put("tips", tips);
return m;
}catch (BizException e) {
logger.error("",e);
return Result.error("data-0",e.getMessage());
} catch (Exception e) {
logger.error("",e);
return Result.error("data-0", "付款取消操作失败");
}
return Result.ok();
}
@ApiOperation( value = "修改订单的第三方流水号",notes=" ")
@ApiResponses({
@ -495,8 +471,6 @@ public class XmTaskOrderController {
moOrder.setPrepayId(order.getPrepayId());
moOrder.setPayTime(new Date());
xmTaskOrderService.updateSomeFieldByPk(moOrder);
m.put("tips", tips);
return m;
return Result.ok();
}
}

53
xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java

@ -1,8 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.DateUtils;
@ -83,7 +83,7 @@ public class XmTaskSbillController {
IPage page=QueryTools.initPage(params);
User user=LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTaskSbill> qw = QueryTools.initQueryWrapper(XmTaskSbill.class , params);
List<Map<String,Object>> datas = xmTaskSbillService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTaskSbill列表
@ -106,9 +106,7 @@ public class XmTaskSbillController {
}
if(createPk==false){
if(xmTaskSbillService.selectOneObject(xmTaskSbill) !=null ){
return Result.error("编号重复,请修改编号再提交");
m.put("tips", tips);
return m;
return Result.error("编号重复,请修改编号再提交");
}
}
User user = LoginUtils.getCurrentUserInfo();
@ -127,7 +125,7 @@ public class XmTaskSbillController {
xmTaskSbill.setFmsg("");
xmTaskSbillService.insert(xmTaskSbill);
return Result.ok();
}
@ -141,20 +139,14 @@ public class XmTaskSbillController {
if( xmTaskSbill==null || !StringUtils.hasText(xmTaskSbill.getId())){
return Result.error("请上送结算单编号");
m.put("tips", tips);
return m;
return Result.error("请上送结算单编号");
}
XmTaskSbill sbillDb=this.xmTaskSbillService.selectOneById(xmTaskSbill.getId());
if(!"0".equals(sbillDb.getStatus())){
return Result.error("只有待提交的结算单才能删除");
m.put("tips", tips);
return m;
return Result.error("只有待提交的结算单才能删除");
}
if(!("0".equals(sbillDb.getBizFlowState()) || "4".equals(sbillDb.getBizFlowState()))){
return Result.error("已发审数据不允许删除");
m.put("tips", tips);
return m;
return Result.error("已发审数据不允许删除");
}
//删除结算单时候要一起恢复工时单为未加入结算状态
@ -303,26 +295,20 @@ public class XmTaskSbillController {
if( xmTaskSbill==null || !StringUtils.hasText(xmTaskSbill.getId())){
return Result.error("请上送结算单编号");
m.put("tips", tips);
return m;
return Result.error("请上送结算单编号");
}
XmTaskSbill sbillDb=this.xmTaskSbillService.selectOneById(xmTaskSbill.getId());
if(!"0".equals(sbillDb.getStatus())){
return Result.error("只能修改待提交的结算单");
m.put("tips", tips);
return m;
return Result.error("只能修改待提交的结算单");
}
if(!("0".equals(sbillDb.getBizFlowState()) || "4".equals(sbillDb.getBizFlowState()))){
return Result.error("已发审数据不允许修改");
m.put("tips", tips);
return m;
return Result.error("已发审数据不允许修改");
}
xmTaskSbill.setLtime(new Date());
xmTaskSbillService.updateByPk(xmTaskSbill);
return Result.ok();
}
@ -360,22 +346,9 @@ public class XmTaskSbillController {
String sbillId= (String) paramMap.get("sbillId");
if( !StringUtils.hasText(sbillId)){
return Result.error("结算单ID必传");
map.put("tips", tips);
return map;
}
map.putAll(paramMap);
this.xmTaskSbillService.processApprova(map);
logger.debug("procInstId====="+paramMap.get("procInstId"));
}catch (BizException e) {
tips=e.getTips();
logger.error("执行异常",e);
}catch (Exception e) {
return Result.error(e.getMessage());
logger.error("执行异常",e);
}
map.put("tips", tips);
return map;
this.xmTaskSbillService.processApprova(map);
return Result.ok();
}
}

13
xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java

@ -1,9 +1,9 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.core.utils.ResponseHelper;
@ -29,7 +29,6 @@ import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.fromMap;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_task_sbill_detail 工时登记表的操作有增删改查,对应的url分别为:<br>
@ -70,7 +69,7 @@ public class XmTaskSbillDetailController {
IPage page=QueryTools.initPage(params);
User user=LoginUtils.getCurrentUserInfo();
params.put("linkBranchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTaskSbillDetail> qw = QueryTools.initQueryWrapper(XmTaskSbillDetail.class , params);
List<Map<String,Object>> datas = xmTaskSbillDetailService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTaskSbillDetail列表
@ -103,13 +102,13 @@ public class XmTaskSbillDetailController {
public Result listSumSamtGroupByProjectIdBizMonth(@ApiIgnore @RequestParam Map<String,Object> params){
String bizYear= (String) xmTaskSbillDetail.get("bizYear");
String bizYear= (String) params.get("bizYear");
if(!StringUtils.hasText(bizYear)){
return ResponseHelper.failed("bizYear-0","年份不能为空");
}
User user=LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(params); //列出XmTaskSbillDetail列表
@ -123,13 +122,13 @@ public class XmTaskSbillDetailController {
public Result listSumSamtGroupByBranchIdBizMonth(@ApiIgnore @RequestParam Map<String,Object> params){
String bizYear= (String) xmTaskSbillDetail.get("bizYear");
String bizYear= (String) params.get("bizYear");
if(!StringUtils.hasText(bizYear)){
return ResponseHelper.failed("bizYear-0","年份不能为空");
}
User user=LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(xmTaskSbillDetail); //列出XmTaskSbillDetail列表
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(params); //列出XmTaskSbillDetail列表

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

@ -1,9 +1,8 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmTaskSkill;
@ -54,7 +53,7 @@ public class XmTaskSkillController {
public Result listXmTaskSkill(@ApiIgnore @RequestParam Map<String,Object> params){
IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTaskSkill> qw = QueryTools.initQueryWrapper(XmTaskSkill.class , params);
List<Map<String,Object>> datas = xmTaskSkillService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTaskSkill列表

49
xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java

@ -1,14 +1,15 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmTestCase;
import com.xm.core.service.XmGroupService;
@ -26,9 +27,7 @@ import springfox.documentation.annotations.ApiIgnore;
import java.util.*;
import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.fromMap;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
import static com.mdp.core.utils.BaseUtils.*;
/**
* url编制采用rest风格,如对xm_test_case 测试用例的操作有增删改查,对应的url分别为:<br>
@ -77,8 +76,8 @@ public class XmTestCaseController {
RequestUtils.transformArray(params, "ids");
RequestUtils.transformArray(params, "menuIds");
IPage page=QueryTools.initPage(params);
paramsInit(xmTestCase);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
paramsInit(params);
QueryWrapper<XmTestCase> qw = QueryTools.initQueryWrapper(XmTestCase.class , params);
List<Map<String,Object>> datas = xmTestCaseService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestCase列表
@ -92,14 +91,14 @@ public class XmTestCaseController {
public Result getXmTestCaseSort(@ApiIgnore @RequestParam Map<String,Object> params){
paramsInit(xmTestCase);
String groupBy= (String) xmTestCase.get("groupBy");
paramsInit(params);
String groupBy= (String) params.get("groupBy");
if("func_id".equals(groupBy) || "menu_id".equals(groupBy) || "cuserid".equals(groupBy)){
}else {
return Result.error("groupBy-0","分组参数错误");
}
List<Map<String,Object>> xmTestCaseList = xmTestCaseService.getXmTestCaseSort(xmTestCase); //列出XmTestCase列表
List<Map<String,Object>> xmTestCaseList = xmTestCaseService.getXmTestCaseSort(params); //列出XmTestCase列表
}
@ -139,10 +138,8 @@ public class XmTestCaseController {
}
User user=LoginUtils.getCurrentUserInfo();
XmProduct xmProductDb=productService.getProductFromCache(xmTestCase.getProductId());
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCase.getCuserid(),xmTestCase.getCusername(),xmTestCase.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCase.getCuserid(),xmTestCase.getCusername(),xmTestCase.getCbranchId());
Result.assertIsFalse(tips);
if(!StringUtils.hasText(xmTestCase.getCuserid())){
xmTestCase.setCuserid(user.getUserid());
xmTestCase.setCbranchId(user.getBranchId());
@ -159,7 +156,7 @@ public class XmTestCaseController {
xmTestCase.setCtime(new Date());
xmTestCase.setLtime(new Date());
xmTestCaseService.insert(xmTestCase);
return Result.ok();
}
@ApiOperation( value = "删除一条测试用例信息",notes=" ")
@ -180,14 +177,12 @@ public class XmTestCaseController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestCaseDb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),xmTestCaseDb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),xmTestCaseDb.getCbranchId());
Result.assertIsFalse(tips);
}
xmTestCaseService.deleteByPk(xmTestCase);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
return Result.ok();
}
@ApiOperation( value = "根据主键修改一条测试用例信息",notes=" ")
@ -208,10 +203,8 @@ public class XmTestCaseController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestCaseDb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null);
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null);
Result.assertIsFalse(tips);
}
xmTestCase.setLuserid(user.getUserid());
@ -265,10 +258,8 @@ public class XmTestCaseController {
}
XmProduct xmProductDb=productService.getProductFromCache(xmTestCaseDb2.getProductId());
if( StringUtils.hasText(xmTestCase.getCuserid()) ){
tips=this.productQxService.checkProductQx(xmProductDb,1,user,xmTestCase.getCuserid(),xmTestCase.getCusername(),null);
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=this.productQxService.checkProductQx(xmProductDb,1,user,xmTestCase.getCuserid(),xmTestCase.getCusername(),null);
Result.assertIsFalse(tips);
}
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(isPm){
@ -332,7 +323,7 @@ public class XmTestCaseController {
can=datasDb;
}else {
for (XmTestCase data : datasDb) {
tips=productQxService.checkProductQx(xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
if(tips.isOk()){
can.add(data);
}else {

38
xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java

@ -1,14 +1,15 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmTestCasedb;
import com.xm.core.service.XmGroupService;
@ -28,7 +29,6 @@ import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.fromMap;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_test_casedb 测试用例库的操作有增删改查,对应的url分别为:<br>
@ -109,10 +109,8 @@ public class XmTestCasedbController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId());
Result.assertIsFalse(tips);
}
xmTestCasedb.setPbranchId(xmProductDb.getBranchId());
xmTestCasedb.setCtime(new Date());
@ -141,10 +139,8 @@ public class XmTestCasedbController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedbDb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId());
Result.assertIsFalse(tips);
}
xmTestCasedbService.deleteByPk(xmTestCasedb);
return Result.ok();
@ -170,16 +166,12 @@ public class XmTestCasedbController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedbDb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(StringUtils.hasText(xmTestCasedb.getCuserid())){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId());
Result.assertIsFalse(tips);
}
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId());
Result.assertIsFalse(tips);
}
xmTestCasedbService.updateSomeFieldByPk(xmTestCasedb);
@ -224,10 +216,8 @@ public class XmTestCasedbController {
User user = LoginUtils.getCurrentUserInfo();
XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedbDb.getProductId());
if(StringUtils.hasText(xmTestCasedb.getCuserid())){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedb.getCuserid(),xmTestCasedb.getCusername(),xmTestCasedb.getCbranchId());
Result.assertIsFalse(tips);
}
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb, user.getUserid());
@ -238,7 +228,7 @@ public class XmTestCasedbController {
can=xmTestCasedbsDb;
}else {
for (XmTestCasedb data : xmTestCasedbsDb) {
tips=productQxService.checkProductQx(xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
if(!tips.isOk()){
no.add(data);
noTips.add(tips.getMsg());
@ -298,7 +288,7 @@ public class XmTestCasedbController {
can=datasDb;
}else {
for (XmTestCasedb data : datasDb) {
tips=productQxService.checkProductQx(xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
if(!tips.isOk()){
no.add(data);
noTips.add(tips.getMsg());

29
xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java

@ -1,9 +1,9 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.DateUtils;
import com.mdp.core.utils.RequestUtils;
@ -26,7 +26,6 @@ import java.util.*;
import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.*;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_test_plan_case 测试计划与用例关系表的操作有增删改查,对应的url分别为:<br>
@ -84,7 +83,7 @@ public class XmTestPlanCaseController {
User user= LoginUtils.getCurrentUserInfo();
paramsInit(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTestPlanCase> qw = QueryTools.initQueryWrapper(XmTestPlanCase.class , params);
List<Map<String,Object>> datas = xmTestPlanCaseService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestPlanCase列表
@ -122,6 +121,7 @@ public class XmTestPlanCaseController {
User user= LoginUtils.getCurrentUserInfo();
paramsInit(params);
List<Map<String,Object>> datas = xmTestPlanCaseService.getXmTestPlanCaseExecStatusDist(params); //列出XmTestPlanCase列表
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestPlanCase列表
}
@ -136,7 +136,8 @@ public class XmTestPlanCaseController {
IPage page=QueryTools.initPage(params);
paramsInit(params);
List<Map<String,Object>> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestPlanCaseUserDist(params); //列出XmTestPlanCase列表
List<Map<String,Object>> datas = xmTestPlanCaseService.getXmTestPlanCaseUserDist(params); //列出XmTestPlanCase列表
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestPlanCase列表
}
@ -152,7 +153,9 @@ public class XmTestPlanCaseController {
IPage page=QueryTools.initPage(params);
User user= LoginUtils.getCurrentUserInfo();
paramsInit(params);
List<Map<String,Object>> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestDayTimesList(params); //列出XmTestPlanCase列表
List<Map<String,Object>> datas = xmTestPlanCaseService.getXmTestDayTimesList(params); //列出XmTestPlanCase列表
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestPlanCase列表
}
@ApiOperation( value = "查询测试用例规划到测试计划的数目",notes=" ")
@ -166,7 +169,8 @@ public class XmTestPlanCaseController {
IPage page=QueryTools.initPage(params);
User user= LoginUtils.getCurrentUserInfo();
paramsInit(params);
List<Map<String,Object>> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestCaseToPlanCalcList(params); //列出XmTestPlanCase列表
List<Map<String,Object>> datas = xmTestPlanCaseService.getXmTestCaseToPlanCalcList(params); //列出XmTestPlanCase列表
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestPlanCase列表
}
@ -254,13 +258,10 @@ public class XmTestPlanCaseController {
return Result.error("product-not-exists","产品已不存在");
}
User user=LoginUtils.getCurrentUserInfo();
tips=productQxService.checkProductQx(xmProductDb,1,user);
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user);
Result.assertIsFalse(tips);
xmTestPlanCaseService.deleteByPk(xmTestPlanCase);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());
return Result.ok();
}
@ApiOperation( value = "根据主键修改一条测试计划与用例关系表信息",notes=" ")
@ -343,9 +344,9 @@ public class XmTestPlanCaseController {
return Result.error("product-not-exists","产品已不存在");
}
if(StringUtils.hasText(xmTestPlanCase.getExecUserid())){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanCase.getExecUserid(),xmTestPlanCase.getExecUsername(),null);
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanCase.getExecUserid(),xmTestPlanCase.getExecUsername(),null);
}else {
tips=productQxService.checkProductQx(xmProductDb,1,user);
Tips tips=productQxService.checkProductQx(xmProductDb,1,user);
}
if(!tips.isOk()){
return Result.error(tips);

28
xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java

@ -1,14 +1,15 @@
package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmTestPlan;
import com.xm.core.service.XmGroupService;
@ -28,7 +29,6 @@ import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.fromMap;
import static com.mdp.core.utils.BaseUtils.toMap;
import static com.mdp.core.utils.ResponseHelper.failed;
/**
* url编制采用rest风格,如对xm_test_plan 测试计划的操作有增删改查,对应的url分别为:<br>
@ -133,10 +133,8 @@ public class XmTestPlanController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestPlan.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlan.getCuserid(),xmTestPlan.getCusername(),xmTestPlan.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlan.getCuserid(),xmTestPlan.getCusername(),xmTestPlan.getCbranchId());
Result.assertIsFalse(tips);
}
xmTestPlan.setPbranchId(xmProductDb.getBranchId());
xmTestPlan.setCuserid(user.getUserid());
@ -166,10 +164,8 @@ public class XmTestPlanController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanDb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
Result.assertIsFalse(tips);
}
xmTestPlanService.deleteByPk(xmTestPlan);
return Result.ok();
@ -196,10 +192,8 @@ public class XmTestPlanController {
XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanDb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm){
tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
Result.assertIsFalse(tips);
}
xmTestPlanService.updateSomeFieldByPk(xmTestPlan);
@ -243,10 +237,8 @@ public class XmTestPlanController {
User user = LoginUtils.getCurrentUserInfo();
XmProduct xmProductDb=productService.getProductFromCache(xmTestPlanDb2.getProductId());
if(StringUtils.hasText(xmTestPlan.getCuserid())){
tips=this.productQxService.checkProductQx(xmProductDb,1,user,xmTestPlan.getCuserid(),xmTestPlan.getCusername(),xmTestPlan.getCbranchId());
if(!tips.isOk()){
return Result.error(tips);
}
Tips tips=this.productQxService.checkProductQx(xmProductDb,1,user,xmTestPlan.getCuserid(),xmTestPlan.getCusername(),xmTestPlan.getCbranchId());
Result.assertIsFalse(tips);
}
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
List<XmTestPlan> can=new ArrayList<>();

9
xm-core/src/main/java/com/xm/core/service/XmQuestionService.java

@ -36,15 +36,6 @@ public class XmQuestionService extends BaseService {
@Autowired
XmRecordService xmRecordService;
/** 请在此类添加自定义函数 */
public List<Map<String,Object>> getQuestion (Map<String,Object> params) {
List<Map<String,Object>> xmQuestionList = this.selectListMapByWhere(params);
return xmQuestionList;
}
public XmQuestionVo addQuestion( XmQuestionVo xmQuestionVo) {
Tips tips = new Tips();

Loading…
Cancel
Save