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

2.0

master
陈裕财 2 years ago
parent
6045f64c72
commit
312bbc0e66
8 changed files with 53 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java
  2. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
  3. 14
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
  4. 10
      xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
  5. 8
      xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
  6. 5
      xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java
  7. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java
  8. 42
      xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java

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

@ -223,7 +223,7 @@ public class XmTaskExecuserController {
boolean sendMsg=!"0".equals(xmTaskDb.getStatus()); boolean sendMsg=!"0".equals(xmTaskDb.getStatus());
xmTaskExecuserService.addExecuser(xmTaskExecuser,sendMsg); xmTaskExecuserService.addExecuser(xmTaskExecuser,sendMsg);
if(sendMsg){ if(sendMsg){
notifyMsgService.pushMsg(user, xmTaskDb.getCreateUserid(), xmTaskDb.getCreateUsername(), "2", xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "用户【"+xmTaskExecuser.getUsername()+"】投标任务【"+xmTaskDb.getName()+"】，请及时跟进！");
notifyMsgService.pushMsg(user, xmTaskDb.getCreateUserid(), xmTaskDb.getCreateUsername(), "用户【"+xmTaskExecuser.getUsername()+"】投标任务【"+xmTaskDb.getName()+"】，请及时跟进！",null);
} }
sysClient.pushBidsAfterBidSuccess(xmTaskExecuser.getUserid(),xmTaskDb.getId(),xmTaskDb.getBudgetAt(),xmTaskDb.getBudgetWorkload(),1); sysClient.pushBidsAfterBidSuccess(xmTaskExecuser.getUserid(),xmTaskDb.getId(),xmTaskDb.getBudgetAt(),xmTaskDb.getBudgetWorkload(),1);
return Result.ok(); return Result.ok();
@ -259,7 +259,6 @@ public class XmTaskExecuserController {
for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserListDb) { for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserListDb) {
if(!taskId.equals(xmTaskExecuser.getTaskId())){ if(!taskId.equals(xmTaskExecuser.getTaskId())){
return Result.error("批量操作只允许在同一个任务进行"); return Result.error("批量操作只允许在同一个任务进行");
break;
} }
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务 if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务
Tips tips =projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId()); Tips tips =projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
@ -383,7 +382,6 @@ public class XmTaskExecuserController {
String taskId=xmTaskAcceptanceVo.getTaskId(); String taskId=xmTaskAcceptanceVo.getTaskId();
if(!StringUtils.hasText(taskId)){ if(!StringUtils.hasText(taskId)){
return Result.error("taskId-0");
return ResponseHelper.failed("taskId-0","任务编号不能为空"); return ResponseHelper.failed("taskId-0","任务编号不能为空");
} }
XmTask xmTaskDb= xmTaskService.selectOneById(taskId); XmTask xmTaskDb= xmTaskService.selectOneById(taskId);
@ -406,7 +404,6 @@ public class XmTaskExecuserController {
Tips tips1=groupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),projectId); Tips tips1=groupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),projectId);
if( !isTaskCreater && !tips1.isOk() ) { if( !isTaskCreater && !tips1.isOk() ) {
return Result.error("您无权验收该任务！"); return Result.error("您无权验收该任务！");
return ResponseHelper.failed(tips);
} }
if("2".equals(xmTaskDb.getEstate()) && xmTaskDb.getEfunds()!=null && xmTaskDb.getEfunds().compareTo(BigDecimal.ZERO)>0){ if("2".equals(xmTaskDb.getEstate()) && xmTaskDb.getEfunds()!=null && xmTaskDb.getEfunds().compareTo(BigDecimal.ZERO)>0){
needPay=true; needPay=true;
@ -418,7 +415,7 @@ public class XmTaskExecuserController {
if(needPay){ if(needPay){
//XmTaskExecuser xmTaskExecuserDb=this.xmTaskExecuserService.selectOneById(map("taskId",xmTaskDb.getId(),"userid",xmTaskDb.getExecutorUserid())); //XmTaskExecuser xmTaskExecuserDb=this.xmTaskExecuserService.selectOneById(map("taskId",xmTaskDb.getId(),"userid",xmTaskDb.getExecutorUserid()));
//调用ac系统付款给服务商 //调用ac系统付款给服务商
Tips tips payTips=acClient.platformBalancePayToClient(xmTaskDb.getExecutorUserid(),"3","1",xmTaskDb.getId(),xmTaskDb.getQuoteFinalAt(),"任务【"+xmTaskDb.getName()+"】验收完毕，发放佣金.");
Tips payTips=acClient.platformBalancePayToClient(xmTaskDb.getExecutorUserid(),"3","1",xmTaskDb.getId(),xmTaskDb.getQuoteFinalAt(),"任务【"+xmTaskDb.getName()+"】验收完毕，发放佣金.");
if(payTips.isOk()){ if(payTips.isOk()){
xmTaskUpdate.setEtoDevTime(new Date()); xmTaskUpdate.setEtoDevTime(new Date());
xmTaskUpdate.setBidStep("7"); xmTaskUpdate.setBidStep("7");
@ -439,10 +436,10 @@ public class XmTaskExecuserController {
if(needPay){ if(needPay){
sysClient.pushPayAtAfterTaskAcceptanceSuccess(xmTaskDb.getExecutorUserid(),xmTaskDb.getId(),xmTaskDb.getEfunds(),xmTaskDb.getBudgetWorkload()); sysClient.pushPayAtAfterTaskAcceptanceSuccess(xmTaskDb.getExecutorUserid(),xmTaskDb.getId(),xmTaskDb.getEfunds(),xmTaskDb.getBudgetWorkload());
notifyMsgService.pushMsg(user, xmTaskDb.getExecutorUserid(), xmTaskDb.getExecutorUsername(), "2", xmTaskDb.getProjectId(), xmTaskDb.getId(), "您执行的任务【" + xmTaskDb.getName() + "】已验收通过，已发放佣金【"+xmTaskDb.getEfunds()+"】。");
notifyMsgService.pushMsg(user, xmTaskDb.getExecutorUserid(), xmTaskDb.getExecutorUsername(), "您执行的任务【" + xmTaskDb.getName() + "】已验收通过，已发放佣金【"+xmTaskDb.getEfunds()+"】。",null);
xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-验收任务", "验收任务【"+xmTaskDb.getName()+"】，验收通过。已发放佣金【"+xmTaskDb.getEfunds()+"】元"); xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-验收任务", "验收任务【"+xmTaskDb.getName()+"】，验收通过。已发放佣金【"+xmTaskDb.getEfunds()+"】元");
}else{ }else{
notifyMsgService.pushMsg(user, xmTaskDb.getExecutorUserid(), xmTaskDb.getExecutorUsername(), "2", xmTaskDb.getProjectId(), xmTaskDb.getId(), "您执行的任务【" + xmTaskDb.getName() + "】已验收通过");
notifyMsgService.pushMsg(user, xmTaskDb.getExecutorUserid(), xmTaskDb.getExecutorUsername(), "您执行的任务【" + xmTaskDb.getName() + "】已验收通过",null);
xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-验收任务", "验收任务【"+xmTaskDb.getName()+"】，验收通过。"); xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-验收任务", "验收任务【"+xmTaskDb.getName()+"】，验收通过。");
} }
return Result.ok(); return Result.ok();
@ -474,13 +471,13 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId(); String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
Tips tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
Tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() );
Result.assertIsFalse(tips); Result.assertIsFalse(tips);
} }
XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid())); XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid()));
if("0".equals(xmTaskExecuserDb.getStatus())) { if("0".equals(xmTaskExecuserDb.getStatus())) {
xmTaskExecuserService.quotePrice(xmTaskExecuser); xmTaskExecuserService.quotePrice(xmTaskExecuser);
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), user.getUsername()+"修改任务【" + xmTask.getId() + "-" + xmTask.getName() + "】的报价信息，请尽快选标！");
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), user.getUsername()+"修改任务【" + xmTask.getId() + "-" + xmTask.getName() + "】的报价信息，请尽快选标！",null);
}else { }else {
@ -510,12 +507,12 @@ public class XmTaskExecuserController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
String projectId=xmTaskExecuser.getProjectId(); String projectId=xmTaskExecuser.getProjectId();
if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {
Tips tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
Tips tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId());
Result.assertIsFalse(tips); Result.assertIsFalse(tips);
} }
xmTaskExecuserService.becomeCandidate(xmTaskExecuser); xmTaskExecuserService.becomeCandidate(xmTaskExecuser);
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTask.getProjectId(), xmTask.getId(), user.getUsername()+"投标任务【" + xmTask.getId() + "-" + xmTask.getName() + "】，请尽快选标！");
notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), user.getUsername()+"投标任务【" + xmTask.getId() + "-" + xmTask.getName() + "】，请尽快选标！",null);
return Result.ok(); return Result.ok();
@ -548,8 +545,8 @@ public class XmTaskExecuserController {
} }
if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) { if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) {
xmTaskExecuserService.delete(xmTaskExecuser); xmTaskExecuserService.delete(xmTaskExecuser);
notifyMsgService.pushMsg(user, xmTaskDb.getCreateUserid(), xmTaskDb.getCreateUsername(), "2", xmTaskDb.getProjectId(), xmTaskDb.getId(), xmTaskExecuserDb.getUsername()+"离开任务【" + xmTaskDb.getId() + "-" + xmTaskDb.getName() + "】！");
notifyMsgService.pushMsg(user, xmTaskExecuserDb.getUserid(), xmTaskExecuserDb.getUsername(), "2", xmTaskDb.getProjectId(), xmTaskDb.getId(), "您已离开任务【" + xmTaskDb.getId() + "-" + xmTaskDb.getName() + "】！");
notifyMsgService.pushMsg(user, xmTaskDb.getCreateUserid(), xmTaskDb.getCreateUsername(), xmTaskExecuserDb.getUsername()+"离开任务【" + xmTaskDb.getId() + "-" + xmTaskDb.getName() + "】！",null);
notifyMsgService.pushMsg(user, xmTaskExecuserDb.getUserid(), xmTaskExecuserDb.getUsername(), "您已离开任务【" + xmTaskDb.getId() + "-" + xmTaskDb.getName() + "】！",null);
}else { }else {

3
xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java
View File

@ -3,7 +3,6 @@ package com.xm.core.ctrl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result; import com.mdp.core.entity.Result;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools; import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.NumberUtil;
import com.mdp.core.utils.RequestUtils; import com.mdp.core.utils.RequestUtils;
@ -252,7 +251,7 @@ public class XmTaskOrderController {
}else{ }else{
remark="任务推广佣金"; remark="任务推广佣金";
} }
msgService.pushMsg(user,user.getUserid(),user.getUsername(),"2",order.getProjectId(),order.getTaskId(),"您为任务支付"+remark+order.getFinalFee()+"元订单提交成功，请及时付款");
msgService.pushMsg(user,user.getUserid(),user.getUsername(),"您为任务支付"+remark+order.getFinalFee()+"元订单提交成功，请及时付款",null);
} }
return Result.ok(); return Result.ok();
} }

14
xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java
View File

@ -108,11 +108,8 @@ public class XmTaskSbillDetailController {
} }
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId()); params.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(params); //列出XmTaskSbillDetail列表
List<Map<String,Object>> datas = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(params); //列出XmTaskSbillDetail列表
return Result.ok().setData(datas);
} }
@ApiOperation( value = "查询机构支出费用按月分布报表",notes=" ") @ApiOperation( value = "查询机构支出费用按月分布报表",notes=" ")
@ApiResponses({ @ApiResponses({
@ -128,11 +125,8 @@ public class XmTaskSbillDetailController {
} }
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
params.put("branchId",user.getBranchId()); params.put("branchId",user.getBranchId());
List<Map<String,Object>> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(params); //列出XmTaskSbillDetail列表
List<Map<String,Object>> datas = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(params); //列出XmTaskSbillDetail列表
return Result.ok().setData(datas);
} }
/** /**
@ApiOperation( value = "新增一条工时登记表信息",notes=" ") @ApiOperation( value = "新增一条工时登记表信息",notes=" ")

10
xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
View File

@ -9,7 +9,6 @@ import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams; import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmProduct; import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmTestCase; import com.xm.core.entity.XmTestCase;
import com.xm.core.service.XmGroupService; import com.xm.core.service.XmGroupService;
@ -27,7 +26,8 @@ import springfox.documentation.annotations.ApiIgnore;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.mdp.core.utils.BaseUtils.*;
import static com.mdp.core.utils.BaseUtils.fromMap;
import static com.mdp.core.utils.BaseUtils.toMap;
/** /**
* url编制采用rest风格,如对xm_test_case 测试用例的操作有增删改查,对应的url分别为:<br> * url编制采用rest风格,如对xm_test_case 测试用例的操作有增删改查,对应的url分别为:<br>
@ -98,8 +98,8 @@ public class XmTestCaseController {
}else { }else {
return Result.error("groupBy-0","分组参数错误"); return Result.error("groupBy-0","分组参数错误");
} }
List<Map<String,Object>> xmTestCaseList = xmTestCaseService.getXmTestCaseSort(params); //列出XmTestCase列表
List<Map<String,Object>> datas = xmTestCaseService.getXmTestCaseSort(params); //列出XmTestCase列表
return Result.ok().setData(datas);
} }
@ -214,7 +214,7 @@ public class XmTestCaseController {
xmTestCase.setCbranchId(null); xmTestCase.setCbranchId(null);
xmTestCase.setLtime(new Date()); xmTestCase.setLtime(new Date());
xmTestCaseService.updateSomeFieldByPk(xmTestCase); xmTestCaseService.updateSomeFieldByPk(xmTestCase);
return Result.ok();
} }
@ApiOperation( value = "批量修改某些字段",notes="") @ApiOperation( value = "批量修改某些字段",notes="")

8
xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
View File

@ -75,7 +75,7 @@ public class XmTestCasedbController {
RequestUtils.transformArray(params, "ids"); RequestUtils.transformArray(params, "ids");
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
xmTestCasedb.put("pbranchId",user.getBranchId());
params.put("pbranchId",user.getBranchId());
IPage page=QueryTools.initPage(params); IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params); QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
List<Map<String,Object>> datas = xmTestCasedbService.selectListMapByWhere(page,qw,params); List<Map<String,Object>> datas = xmTestCasedbService.selectListMapByWhere(page,qw,params);
@ -118,7 +118,7 @@ public class XmTestCasedbController {
xmTestCasedb.setCusername(user.getUsername()); xmTestCasedb.setCusername(user.getUsername());
xmTestCasedb.setCbranchId(user.getBranchId()); xmTestCasedb.setCbranchId(user.getBranchId());
xmTestCasedbService.insert(xmTestCasedb); xmTestCasedbService.insert(xmTestCasedb);
return Result.ok().setData(xmTestCasedb);
} }
@ApiOperation( value = "删除一条测试用例库信息",notes=" ") @ApiOperation( value = "删除一条测试用例库信息",notes=" ")
@ -170,10 +170,11 @@ public class XmTestCasedbController {
Result.assertIsFalse(tips); Result.assertIsFalse(tips);
} }
if(!isPm){ if(!isPm){
Tips tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId());
Tips tips=productQxService.checkProductQx(xmProductDb,1,user,xmTestCasedbDb.getCuserid(),xmTestCasedbDb.getCusername(),xmTestCasedbDb.getCbranchId());
Result.assertIsFalse(tips); Result.assertIsFalse(tips);
} }
xmTestCasedbService.updateSomeFieldByPk(xmTestCasedb); xmTestCasedbService.updateSomeFieldByPk(xmTestCasedb);
return Result.ok();
} }
@ -330,7 +331,6 @@ public class XmTestCasedbController {
}else { }else {
return Result.error(msgs.stream().collect(Collectors.joining(";"))); return Result.error(msgs.stream().collect(Collectors.joining(";")));
} }
return Result.ok();
} }

5
xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java
View File

@ -289,6 +289,7 @@ public class XmTestPlanCaseController {
Tips tips=productQxService.checkProductQx(xmProductDb,1,user); Tips tips=productQxService.checkProductQx(xmProductDb,1,user);
Result.assertIsFalse(tips); Result.assertIsFalse(tips);
xmTestPlanCaseService.updateSomeFieldByPk(xmTestPlanCase); xmTestPlanCaseService.updateSomeFieldByPk(xmTestPlanCase);
return Result.ok();
} }
@ -343,10 +344,12 @@ public class XmTestPlanCaseController {
} }
if(StringUtils.hasText(xmTestPlanCase.getExecUserid())){ if(StringUtils.hasText(xmTestPlanCase.getExecUserid())){
Tips tips =productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanCase.getExecUserid(),xmTestPlanCase.getExecUsername(),null); Tips tips =productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanCase.getExecUserid(),xmTestPlanCase.getExecUsername(),null);
Result.assertIsFalse(tips);
}else { }else {
Tips tips =productQxService.checkProductQx(xmProductDb,1,user); Tips tips =productQxService.checkProductQx(xmProductDb,1,user);
}
Result.assertIsFalse(tips); Result.assertIsFalse(tips);
}
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(isPm){ if(isPm){
can=xmTestPlanCasesDb; can=xmTestPlanCasesDb;

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

@ -142,7 +142,7 @@ public class XmTestPlanController {
xmTestPlan.setCtime(new Date()); xmTestPlan.setCtime(new Date());
xmTestPlan.setCbranchId(user.getBranchId()); xmTestPlan.setCbranchId(user.getBranchId());
xmTestPlanService.insert(xmTestPlan); xmTestPlanService.insert(xmTestPlan);
return Result.ok().setData(xmTestPlan);
} }
@ApiOperation( value = "删除一条测试计划信息",notes=" ") @ApiOperation( value = "删除一条测试计划信息",notes=" ")
@ -196,7 +196,7 @@ public class XmTestPlanController {
Result.assertIsFalse(tips); Result.assertIsFalse(tips);
} }
xmTestPlanService.updateSomeFieldByPk(xmTestPlan); xmTestPlanService.updateSomeFieldByPk(xmTestPlan);
return Result.ok();
} }
@ApiOperation( value = "批量修改某些字段",notes="") @ApiOperation( value = "批量修改某些字段",notes="")

42
xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java
View File

@ -1,10 +1,9 @@
package com.xm.core.ctrl; package com.xm.core.ctrl;
import com.alibaba.druid.sql.dialect.odps.ast.OdpsAddTableStatement;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mdp.core.entity.Result; import com.mdp.core.entity.Result;
import com.mdp.core.entity.Tips; import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException;
import com.mdp.core.query.QueryTools; import com.mdp.core.query.QueryTools;
import com.mdp.core.utils.BaseUtils; import com.mdp.core.utils.BaseUtils;
import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.NumberUtil;
@ -24,15 +23,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.w3c.dom.CDATASection;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.mdp.core.utils.ResponseHelper.failed;
/** /**
* url编制采用rest风格,如对xm_workload 工时登记表的操作有增删改查,对应的url分别为:<br> * url编制采用rest风格,如对xm_workload 工时登记表的操作有增删改查,对应的url分别为:<br>
* 新增: core/xmWorkload/add <br> * 新增: core/xmWorkload/add <br>
@ -104,7 +100,7 @@ public class XmWorkloadController {
String userid= (String) params.get("userid"); String userid= (String) params.get("userid");
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
params.put("linkBranchId",user.getBranchId()); params.put("linkBranchId",user.getBranchId());
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmWorkload> qw = QueryTools.initQueryWrapper(XmWorkload.class , params);
List<Map<String,Object>> datas = xmWorkloadService.selectListMapByWhere(page,qw,params); List<Map<String,Object>> datas = xmWorkloadService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmWorkload列表 return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmWorkload列表
@ -136,8 +132,8 @@ public class XmWorkloadController {
IPage page=QueryTools.initPage(params); IPage page=QueryTools.initPage(params);
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
params.put("linkBranchId",user.getBranchId()); params.put("linkBranchId",user.getBranchId());
List<Map<String,Object>> xmWorkloadList = xmWorkloadService.listProjectWorkloadSetMonth(params); //列出XmWorkload列表
List<Map<String,Object>> datas = xmWorkloadService.listProjectWorkloadSetMonth(params); //列出XmWorkload列表
return Result.ok().setData(datas);
} }
@ -159,8 +155,8 @@ public class XmWorkloadController {
if("my".equals(queryScope)){ if("my".equals(queryScope)){
params.put("userid",user.getUserid()); params.put("userid",user.getUserid());
} }
List<Map<String,Object>> xmWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUserid(params); //列出XmWorkload列表
List<Map<String,Object>> datas = xmWorkloadService.ListGroupByTaskIdAndUserid(params); //列出XmWorkload列表
return Result.ok().setData(datas);
} }
@ApiOperation( value = "按任务及报工人查询待确认工时",notes=" ") @ApiOperation( value = "按任务及报工人查询待确认工时",notes=" ")
@ -175,14 +171,14 @@ public class XmWorkloadController {
RequestUtils.transformArray(params, "wstatuses"); RequestUtils.transformArray(params, "wstatuses");
RequestUtils.transformArray(params, "sstatuses"); RequestUtils.transformArray(params, "sstatuses");
IPage page=QueryTools.initPage(params); IPage page=QueryTools.initPage(params);
String queryScope= (String) xmWorkload.get("queryScope");
String queryScope= (String) params.get("queryScope");
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
params.put("linkBranchId",user.getBranchId()); params.put("linkBranchId",user.getBranchId());
if("my".equals(queryScope)){ if("my".equals(queryScope)){
params.put("userid",user.getUserid()); params.put("userid",user.getUserid());
} }
List<Map<String,Object>> xmWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUseridToSet(params); //列出XmWorkload列表
List<Map<String,Object>> datas = xmWorkloadService.ListGroupByTaskIdAndUseridToSet(params); //列出XmWorkload列表
return Result.ok().setData(datas);
} }
@ -360,8 +356,8 @@ public class XmWorkloadController {
xmWorkload.setBranchId(xmTestCaseDb.getCbranchId()); xmWorkload.setBranchId(xmTestCaseDb.getCbranchId());
xmWorkloadService.insert(xmWorkload); xmWorkloadService.insert(xmWorkload);
}else if("4".equals(xmWorkload.getBizType())){//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 }else if("4".equals(xmWorkload.getBizType())){//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
QueryWrapper<XmWorkload> qw = QueryTools.initQueryWrapper(XmWorkload.class);
List<Map<String,Object>> datas = xmWorkloadService.selectListMapByWhere(page,qw,params);
return Result.ok(); return Result.ok();
if(xmTestPlanCaseDbs==null||xmTestPlanCaseDbs.size()==0){ if(xmTestPlanCaseDbs==null||xmTestPlanCaseDbs.size()==0){
return Result.error("xmTestPlanCaseDb-0","执行用例已不存在"); return Result.error("xmTestPlanCaseDb-0","执行用例已不存在");
@ -394,7 +390,7 @@ public class XmWorkloadController {
xmWorkload.setPlanId((String) xmTestPlanCaseDb.get("planId")); xmWorkload.setPlanId((String) xmTestPlanCaseDb.get("planId"));
xmWorkloadService.insert(xmWorkload); xmWorkloadService.insert(xmWorkload);
} }
return Result.ok();
} }
@ApiOperation( value = "根据主键修改一条工时登记表信息",notes=" ") @ApiOperation( value = "根据主键修改一条工时登记表信息",notes=" ")
@ApiResponses({ @ApiResponses({
@ -419,9 +415,9 @@ public class XmWorkloadController {
} }
User user= LoginUtils.getCurrentUserInfo(); User user= LoginUtils.getCurrentUserInfo();
if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){ if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){
Tips tips isCreate=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId());
Tips isCreate=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId());
if(!isCreate.isOk()){ if(!isCreate.isOk()){
Tips tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId());
Tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId());
if(!isExec.isOk()){ if(!isExec.isOk()){
return Result.error("noqx-0","你无权针对该业务进行报工"); return Result.error("noqx-0","你无权针对该业务进行报工");
} }
@ -432,7 +428,7 @@ public class XmWorkloadController {
pushService.pushXmTask(xmTaskDb); pushService.pushXmTask(xmTaskDb);
this.xmTaskService.calcWorkloadByRecord(xmWorkload.getTaskId()); this.xmTaskService.calcWorkloadByRecord(xmWorkload.getTaskId());
return Result.ok();
} }
@ -461,9 +457,9 @@ public class XmWorkloadController {
Set<String> xmMenuIds=new HashSet<>(); Set<String> xmMenuIds=new HashSet<>();
for (XmTask xmTaskDb : tasksDb) { for (XmTask xmTaskDb : tasksDb) {
if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){ if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){
Tips tips isCreate=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId());
Tips isCreate=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId());
if(!isCreate.isOk()){ if(!isCreate.isOk()){
Tips tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId());
Tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId());
if(!isExec.isOk()){ if(!isExec.isOk()){
break; break;
} }
@ -516,7 +512,6 @@ public class XmWorkloadController {
}else{ }else{
return Result.error(msgs.stream().collect(Collectors.joining())); return Result.error(msgs.stream().collect(Collectors.joining()));
} }
return Result.ok();
} }
@ -621,8 +616,5 @@ public class XmWorkloadController {
return Result.error(msgs.stream().collect(Collectors.joining())); return Result.error(msgs.stream().collect(Collectors.joining()));
} }
//
return Result.ok();
} }
} }
Write Preview
Loading…
Cancel
Save