From 312bbc0e662268fecfa84b7677cdcb7dc268cbb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 3 Oct 2023 14:45:38 +0800 Subject: [PATCH] 2.0 --- .../core/ctrl/XmTaskExecuserController.java | 23 ++++------ .../xm/core/ctrl/XmTaskOrderController.java | 3 +- .../ctrl/XmTaskSbillDetailController.java | 14 ++---- .../xm/core/ctrl/XmTestCaseController.java | 12 ++--- .../xm/core/ctrl/XmTestCasedbController.java | 8 ++-- .../core/ctrl/XmTestPlanCaseController.java | 7 ++- .../xm/core/ctrl/XmTestPlanController.java | 8 ++-- .../xm/core/ctrl/XmWorkloadController.java | 46 ++++++++----------- 8 files changed, 53 insertions(+), 68 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index f7274356..07906f0b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -223,7 +223,7 @@ public class XmTaskExecuserController { boolean sendMsg=!"0".equals(xmTaskDb.getStatus()); xmTaskExecuserService.addExecuser(xmTaskExecuser,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); return Result.ok(); @@ -259,7 +259,6 @@ public class XmTaskExecuserController { for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserListDb) { if(!taskId.equals(xmTaskExecuser.getTaskId())){ return Result.error("批量操作只允许在同一个任务进行"); - break; } if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务 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(); if(!StringUtils.hasText(taskId)){ - return Result.error("taskId-0"); return ResponseHelper.failed("taskId-0","任务编号不能为空"); } XmTask xmTaskDb= xmTaskService.selectOneById(taskId); @@ -406,7 +404,6 @@ public class XmTaskExecuserController { Tips tips1=groupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),projectId); if( !isTaskCreater && !tips1.isOk() ) { return Result.error("您无权验收该任务！"); - return ResponseHelper.failed(tips); } if("2".equals(xmTaskDb.getEstate()) && xmTaskDb.getEfunds()!=null && xmTaskDb.getEfunds().compareTo(BigDecimal.ZERO)>0){ needPay=true; @@ -418,7 +415,7 @@ public class XmTaskExecuserController { if(needPay){ //XmTaskExecuser xmTaskExecuserDb=this.xmTaskExecuserService.selectOneById(map("taskId",xmTaskDb.getId(),"userid",xmTaskDb.getExecutorUserid())); //调用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()){ xmTaskUpdate.setEtoDevTime(new Date()); xmTaskUpdate.setBidStep("7"); @@ -439,10 +436,10 @@ public class XmTaskExecuserController { if(needPay){ 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()+"】元"); }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()+"】，验收通过。"); } return Result.ok(); @@ -474,13 +471,13 @@ public class XmTaskExecuserController { User user=LoginUtils.getCurrentUserInfo(); String projectId=xmTaskExecuser.getProjectId(); 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); } 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() + "】的报价信息，请尽快选标！"); + notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), user.getUsername()+"修改任务【" + xmTask.getId() + "-" + xmTask.getName() + "】的报价信息，请尽快选标！",null); }else { @@ -510,12 +507,12 @@ public class XmTaskExecuserController { User user=LoginUtils.getCurrentUserInfo(); String projectId=xmTaskExecuser.getProjectId(); 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); } 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(); @@ -548,8 +545,8 @@ public class XmTaskExecuserController { } if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) { 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 { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java index 64662439..98d4a84b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java @@ -3,7 +3,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.err.BizException; import com.mdp.core.query.QueryTools; import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.RequestUtils; @@ -252,7 +251,7 @@ public class XmTaskOrderController { }else{ 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(); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java index 4aaa3194..6815503d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java @@ -108,11 +108,8 @@ public class XmTaskSbillDetailController { } User user=LoginUtils.getCurrentUserInfo(); params.put("branchId",user.getBranchId()); - List> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(params); //列出XmTaskSbillDetail列表 - - - - + List> datas = xmTaskSbillDetailService.listSumSamtGroupByProjectIdBizMonth(params); //列出XmTaskSbillDetail列表 + return Result.ok().setData(datas); } @ApiOperation( value = "查询机构支出费用按月分布报表",notes=" ") @ApiResponses({ @@ -128,11 +125,8 @@ public class XmTaskSbillDetailController { } User user=LoginUtils.getCurrentUserInfo(); params.put("branchId",user.getBranchId()); - List> xmTaskSbillDetailList = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(params); //列出XmTaskSbillDetail列表 - - - - + List> datas = xmTaskSbillDetailService.listSumSamtGroupByBranchIdBizMonth(params); //列出XmTaskSbillDetail列表 + return Result.ok().setData(datas); } /** @ApiOperation( value = "新增一条工时登记表信息",notes=" ") diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java index 81044a0f..b6bfe8ad 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java @@ -9,7 +9,6 @@ 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; @@ -27,7 +26,8 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.*; 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分别为:
@@ -98,8 +98,8 @@ public class XmTestCaseController { }else { return Result.error("groupBy-0","分组参数错误"); } - List> xmTestCaseList = xmTestCaseService.getXmTestCaseSort(params); //列出XmTestCase列表 - + List> datas = xmTestCaseService.getXmTestCaseSort(params); //列出XmTestCase列表 + return Result.ok().setData(datas); } @@ -214,7 +214,7 @@ public class XmTestCaseController { xmTestCase.setCbranchId(null); xmTestCase.setLtime(new Date()); xmTestCaseService.updateSomeFieldByPk(xmTestCase); - + return Result.ok(); } @ApiOperation( value = "批量修改某些字段",notes="") @@ -266,7 +266,7 @@ public class XmTestCaseController { can=xmTestCasesDb; }else{ for (XmTestCase xmTestCaseDb : xmTestCasesDb) { - Tips tips 2 = productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null); + Tips tips2 = productQxService.checkProductQx(xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null); if(!tips2.isOk()){ no.add(xmTestCaseDb); noTipsMap.put(tips2.getMsg(),tips2); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java index b87e39a7..1f31efe1 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java @@ -75,7 +75,7 @@ public class XmTestCasedbController { RequestUtils.transformArray(params, "ids"); User user=LoginUtils.getCurrentUserInfo(); - xmTestCasedb.put("pbranchId",user.getBranchId()); + params.put("pbranchId",user.getBranchId()); IPage page=QueryTools.initPage(params); QueryWrapper qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params); List> datas = xmTestCasedbService.selectListMapByWhere(page,qw,params); @@ -118,7 +118,7 @@ public class XmTestCasedbController { xmTestCasedb.setCusername(user.getUsername()); xmTestCasedb.setCbranchId(user.getBranchId()); xmTestCasedbService.insert(xmTestCasedb); - + return Result.ok().setData(xmTestCasedb); } @ApiOperation( value = "删除一条测试用例库信息",notes=" ") @@ -170,10 +170,11 @@ public class XmTestCasedbController { Result.assertIsFalse(tips); } 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); } xmTestCasedbService.updateSomeFieldByPk(xmTestCasedb); + return Result.ok(); } @@ -330,7 +331,6 @@ public class XmTestCasedbController { }else { return Result.error(msgs.stream().collect(Collectors.joining(";"))); } - return Result.ok(); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java index 6462266c..1b467713 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java @@ -289,6 +289,7 @@ public class XmTestPlanCaseController { Tips tips=productQxService.checkProductQx(xmProductDb,1,user); Result.assertIsFalse(tips); xmTestPlanCaseService.updateSomeFieldByPk(xmTestPlanCase); + return Result.ok(); } @@ -343,16 +344,18 @@ public class XmTestPlanCaseController { } if(StringUtils.hasText(xmTestPlanCase.getExecUserid())){ Tips tips =productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanCase.getExecUserid(),xmTestPlanCase.getExecUsername(),null); + Result.assertIsFalse(tips); }else { Tips tips =productQxService.checkProductQx(xmProductDb,1,user); + Result.assertIsFalse(tips); } - Result.assertIsFalse(tips); + boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid()); if(isPm){ can=xmTestPlanCasesDb; }else { for (XmTestPlanCase pcDb : xmTestPlanCasesDb) { - Tips tips 2 = productQxService.checkProductQx(xmProductDb, 1, user, pcDb.getExecUserid(), pcDb.getExecUsername(), null); + Tips tips2 = productQxService.checkProductQx(xmProductDb, 1, user, pcDb.getExecUserid(), pcDb.getExecUsername(), null); if (!tips2.isOk()) { no.add(xmTestPlanCaseDb); noTipsSet.add(tips2.getMsg()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java index 80125d8d..9b5216f9 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java @@ -142,7 +142,7 @@ public class XmTestPlanController { xmTestPlan.setCtime(new Date()); xmTestPlan.setCbranchId(user.getBranchId()); xmTestPlanService.insert(xmTestPlan); - + return Result.ok().setData(xmTestPlan); } @ApiOperation( value = "删除一条测试计划信息",notes=" ") @@ -196,7 +196,7 @@ public class XmTestPlanController { Result.assertIsFalse(tips); } xmTestPlanService.updateSomeFieldByPk(xmTestPlan); - + return Result.ok(); } @ApiOperation( value = "批量修改某些字段",notes="") @@ -248,7 +248,7 @@ public class XmTestPlanController { can=xmTestPlansDb; }else { for (XmTestPlan xmTestPlanDb : xmTestPlansDb) { - Tips tips 2 =productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); + Tips tips2 =productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); if(!tips2.isOk()){ no.add(xmTestPlanDb); noTips.add(tips2.getMsg()); @@ -303,7 +303,7 @@ public class XmTestPlanController { can=datasDb; }else { for (XmTestPlan xmTestPlanDb : datasDb) { - Tips tips 2 =productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); + Tips tips2 =productQxService.checkProductQx(xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId()); if(!tips2.isOk()){ no.add(xmTestPlanDb); noTips.add(tips2.getMsg()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java index d76a9b79..dc5998d7 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java @@ -1,10 +1,9 @@ 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.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.NumberUtil; @@ -24,15 +23,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import org.w3c.dom.CDATASection; import springfox.documentation.annotations.ApiIgnore; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -import static com.mdp.core.utils.ResponseHelper.failed; - /** * url编制采用rest风格,如对xm_workload 工时登记表的操作有增删改查,对应的url分别为:
* 新增: core/xmWorkload/add
@@ -104,7 +100,7 @@ public class XmWorkloadController { String userid= (String) params.get("userid"); User user=LoginUtils.getCurrentUserInfo(); params.put("linkBranchId",user.getBranchId()); - QueryWrapper qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params); + QueryWrapper qw = QueryTools.initQueryWrapper(XmWorkload.class , params); List> datas = xmWorkloadService.selectListMapByWhere(page,qw,params); return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmWorkload列表 @@ -136,8 +132,8 @@ public class XmWorkloadController { IPage page=QueryTools.initPage(params); User user=LoginUtils.getCurrentUserInfo(); params.put("linkBranchId",user.getBranchId()); - List> xmWorkloadList = xmWorkloadService.listProjectWorkloadSetMonth(params); //列出XmWorkload列表 - + List> datas = xmWorkloadService.listProjectWorkloadSetMonth(params); //列出XmWorkload列表 + return Result.ok().setData(datas); } @@ -159,8 +155,8 @@ public class XmWorkloadController { if("my".equals(queryScope)){ params.put("userid",user.getUserid()); } - List> xmWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUserid(params); //列出XmWorkload列表 - + List> datas = xmWorkloadService.ListGroupByTaskIdAndUserid(params); //列出XmWorkload列表 + return Result.ok().setData(datas); } @ApiOperation( value = "按任务及报工人查询待确认工时",notes=" ") @@ -175,14 +171,14 @@ public class XmWorkloadController { RequestUtils.transformArray(params, "wstatuses"); RequestUtils.transformArray(params, "sstatuses"); IPage page=QueryTools.initPage(params); - String queryScope= (String) xmWorkload.get("queryScope"); + String queryScope= (String) params.get("queryScope"); User user=LoginUtils.getCurrentUserInfo(); params.put("linkBranchId",user.getBranchId()); if("my".equals(queryScope)){ params.put("userid",user.getUserid()); } - List> xmWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUseridToSet(params); //列出XmWorkload列表 - + List> datas = xmWorkloadService.ListGroupByTaskIdAndUseridToSet(params); //列出XmWorkload列表 + return Result.ok().setData(datas); } @@ -287,7 +283,7 @@ public class XmWorkloadController { } //待他人报工，需要检查我的权限，需要项目管理人员才有权限代他人报工。 if(!xmWorkload.getUserid().equals(user.getUserid())){ - Tips tips 3=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmWorkload.getUserid(),xmTaskDb.getProjectId()); + Tips tips3=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmWorkload.getUserid(),xmTaskDb.getProjectId()); if(!tips3.isOk()){ return Result.error("no-qx-for-oth-user","无权限代他人报工。只有项目管理人员可以代他人报工。"); } @@ -360,9 +356,9 @@ public class XmWorkloadController { xmWorkload.setBranchId(xmTestCaseDb.getCbranchId()); xmWorkloadService.insert(xmWorkload); }else if("4".equals(xmWorkload.getBizType())){//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行 - QueryWrapper qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params); - List> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params); - return Result.ok(); + QueryWrapper qw = QueryTools.initQueryWrapper(XmWorkload.class); + List> datas = xmWorkloadService.selectListMapByWhere(page,qw,params); + return Result.ok(); if(xmTestPlanCaseDbs==null||xmTestPlanCaseDbs.size()==0){ return Result.error("xmTestPlanCaseDb-0","执行用例已不存在"); } @@ -394,7 +390,7 @@ public class XmWorkloadController { xmWorkload.setPlanId((String) xmTestPlanCaseDb.get("planId")); xmWorkloadService.insert(xmWorkload); } - + return Result.ok(); } @ApiOperation( value = "根据主键修改一条工时登记表信息",notes=" ") @ApiResponses({ @@ -419,9 +415,9 @@ public class XmWorkloadController { } User user= LoginUtils.getCurrentUserInfo(); 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()){ - Tips tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); + Tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); if(!isExec.isOk()){ return Result.error("noqx-0","你无权针对该业务进行报工"); } @@ -432,7 +428,7 @@ public class XmWorkloadController { pushService.pushXmTask(xmTaskDb); this.xmTaskService.calcWorkloadByRecord(xmWorkload.getTaskId()); - + return Result.ok(); } @@ -461,9 +457,9 @@ public class XmWorkloadController { Set xmMenuIds=new HashSet<>(); for (XmTask xmTaskDb : tasksDb) { 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()){ - Tips tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); + Tips isExec=xmGroupService.checkIsProjectAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); if(!isExec.isOk()){ break; } @@ -516,7 +512,6 @@ public class XmWorkloadController { }else{ return Result.error(msgs.stream().collect(Collectors.joining())); } - return Result.ok(); } @@ -620,9 +615,6 @@ public class XmWorkloadController { }else{ return Result.error(msgs.stream().collect(Collectors.joining())); } - - // - return Result.ok(); } }