From 8fd5193224164a6cf64f7d818e3ec82aca85dc1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 15 Jun 2022 13:30:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=85=B3=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/ctrl/XmGroupUserController.java | 22 ++++++++++++++----- .../core/ctrl/XmTaskWorkloadController.java | 13 ++++++----- .../mapper/xm/core/dao/XmProjectMapper.xml | 2 +- .../mapper/xm/core/dao/XmTaskMapper.xml | 2 +- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java index 342462c7..98fba751 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java @@ -369,12 +369,24 @@ public class XmGroupUserController { return ResponseHelper.failed("userid-or-groupId-0","请上送用户编号及小组编号"); }else{ for (XmGroupUser gu : gus) { - if(!"1".equals(gu.getPgClass())&&!StringUtils.hasText(gu.getProjectId())){ - return ResponseHelper.failed("projectId-0","项目编号不能为空"); - }else if("1".equals(gu.getPgClass())&&!StringUtils.hasText(gu.getProductId())) - return ResponseHelper.failed("productId-0","产品编号不能为空"); + if (!"1".equals(gu.getPgClass()) && !StringUtils.hasText(gu.getProjectId())) { + return ResponseHelper.failed("projectId-0", "项目编号不能为空"); + } else if ("1".equals(gu.getPgClass()) && !StringUtils.hasText(gu.getProductId())) { + return ResponseHelper.failed("productId-0", "产品编号不能为空"); } - + if (!StringUtils.hasText(gu.getObranchId())) { + return ResponseHelper.failed("obranchId-0", "用户归属机构号不能为空"); + } + if (!StringUtils.hasText(gu.getUserid())) { + return ResponseHelper.failed("userid-0", "用户编号不能为空"); + } + if (!StringUtils.hasText(gu.getUsername())) { + return ResponseHelper.failed("username-0", "用户名称不能为空"); + } + if (!StringUtils.hasText(gu.getGroupId())) { + return ResponseHelper.failed("groupId-0", "要加入的组编号不能为空"); + } + } } List gusDb=this.xmGroupUserService.selectListByIds(gus); //过滤掉已经存在的 diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java index fc4ead97..5ab28995 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java @@ -204,6 +204,13 @@ public class XmTaskWorkloadController { return failed("taskId-0","请上送任务编号"); } + if(!StringUtils.hasText(xmTaskWorkload.getUserid())){ + return failed("userid-0","请上送工作人员编号"); + } + if(!StringUtils.hasText(xmTaskWorkload.getUbranchId())){ + return failed("ubranchId-0","请上送工作人员归属机构"); + } + if(!StringUtils.hasText(xmTaskWorkload.getBizDate())) { return failed("bizDate-0","请上送日期"); } @@ -232,7 +239,6 @@ public class XmTaskWorkloadController { if("3".equals(xmTaskDb.getTaskState())){ return failed("taskState-3",xmTaskDb.getName()+"已结算完毕，不能再提交工时"); } - if(!(user.getUserid().equals(xmTaskDb.getCreateUserid())|| user.getUserid().equals(xmTaskDb.getExecutorUserid()))){ Tips isCreate=xmGroupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getCreateUserid(),xmTaskDb.getProjectId()); if(!isCreate.isOk()){ @@ -245,15 +251,10 @@ public class XmTaskWorkloadController { } xmTaskWorkload.setCtime(new Date()); xmTaskWorkload.setCuserid(user.getUserid()); - if(!StringUtils.hasText(xmTaskWorkload.getUserid())){ - xmTaskWorkload.setUserid(user.getUserid()); - xmTaskWorkload.setUsername(user.getUsername()); - } xmTaskWorkload.setWstatus("0"); xmTaskWorkload.setProjectId(xmTaskDb.getProjectId()); xmTaskWorkload.setBranchId(xmTaskDb.getCbranchId()); - xmTaskWorkload.setUbranchId(user.getBranchId()); xmTaskWorkloadService.insert(xmTaskWorkload); if(xmTaskWorkload.getRworkload()!=null && BigDecimal.ZERO.compareTo(xmTaskWorkload.getRworkload())<0){ BigDecimal newBudgetWorkload= xmTaskWorkload.getRworkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)).add(NumberUtil.getBigDecimal(xmTaskDb.getActWorkload(),BigDecimal.ZERO)); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml index 7990e90f..137161c8 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml @@ -46,7 +46,7 @@ - and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.project_id=res.id ) + and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.pbiz_id=res.id and f.biz_id=res.id ) and exists( select 1 from xm_iteration ipl inner join xm_product_project_link l on ipl.product_id=l.product_id diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 1f6a31ba..dd4fe37a 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -41,7 +41,7 @@ - and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.project_id=res.project_id and f.task_id=res.id ) + and exists ( select 1 from xm_my_focus f where f.userid=#{userid} and f.pbiz_id=res.project_id and f.biz_id=res.id ) and exists ( select 1 from xm_task_skill f where f.task_id=res.id and f.task_skill_id in