From 13d082727d5d1eb904a25d509a13fd2646fbc6f1 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 27 Sep 2022 17:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=92=8C=E4=BA=BA=E5=91=98=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/activity/controller/WorkOrderController.java | 3 ++- .../com/xhpc/activity/controller/WorkUserController.java | 4 +++- .../xhpc/activity/service/impl/WorkDeptServiceImpl.java | 7 +++++++ .../xhpc/activity/service/impl/WorkUserServiceImpl.java | 6 ++++++ .../src/main/resources/mapper/XhpcWorkDeptMapper.xml | 2 +- .../src/main/resources/mapper/XhpcWorkOrderMapper.xml | 3 +++ .../src/main/resources/mapper/XhpcWorkUserMapper.xml | 3 +++ 7 files changed, 25 insertions(+), 3 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkOrderController.java index f7cef5ed..91bf8d8a 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkOrderController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkOrderController.java @@ -30,13 +30,14 @@ public class WorkOrderController extends BaseController { @GetMapping("/getPage") public TableDataInfo getOrderPage(HttpServletRequest request, Integer orderType, - String userName){ + String userName, Integer status){ startPage(); LoginUser logUser = logUserUtils.getLogUser(request); Map params = new HashMap<>(); params.put("orderType", orderType); params.put("userName", userName); params.put("tenantId", logUser.getTenantId()); + params.put("status", status); return getDataTable(workOrderService.getOrderPage(params)); } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java index adb18e19..de3e8ce9 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkUserController.java @@ -35,7 +35,8 @@ public class WorkUserController extends BaseController { String userName, String loginName, String phone, - String email) { + String email, + Integer type) { LoginUser loginUser = logUserUtils.getLogUser(request); startPage(); @@ -50,6 +51,7 @@ public class WorkUserController extends BaseController { params.put("loginName", loginName); params.put("phone", phone); params.put("email", email); + params.put("type", type); return getDataTable(workUserService.getPage(params)); } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java index af9f2611..d6e62293 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkDeptServiceImpl.java @@ -75,6 +75,13 @@ public class WorkDeptServiceImpl implements WorkDeptService { throw new CustomException("部门已存在"); } + if(domain.getParentDeptId() != null){ + XhpcWorkDeptDomain parentDeptDomain = deptMapper.selectByPrimaryKey(domain.getParentDeptId()); + if(parentDeptDomain != null && !parentDeptDomain.getType().equals(domain.getType())){ + throw new CustomException("部门类型与上级部门类型不一致"); + } + } + return deptMapper.insert(domain) > 0; } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java index ce3ffefd..473af725 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java @@ -131,6 +131,12 @@ public class WorkUserServiceImpl implements WorkUserService { if(StringUtils.isNotNull(sysUser)){ throw new CustomException("新增用户'" + domain.getUserName() + "'失败，手机号码已存在"); } + + XhpcWorkDeptDomain deptDomain = deptMapper.selectByPrimaryKey(domain.getDeptId()); + if (deptDomain == null || !deptDomain.getType().equals(domain.getType())){ + throw new CustomException("所属部门不存在或部门类型与人员不一致"); + } + workUserMapper.insert(domain); SysUser user = new SysUser(); diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml index e58ed9d5..954091eb 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml @@ -37,7 +37,7 @@ and parent_dept_id=#{params.parentDeptId} - and type=#{params.parentDeptId} + and type=#{params.type} diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml index 04df7afc..0d001888 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml @@ -84,6 +84,9 @@ and o.tenant_id = #{params.tenantId} + + and o.status = #{params.status} + GROUP BY o.work_order_id ORDER BY o.status ASC,o.create_time desc diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml index fcf63d7c..d09971ea 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml @@ -124,6 +124,9 @@ and (d.work_dept_id=#{params.deptId} or d.parent_dept_id=#{params.deptId}) + + and u.type = #{params.type} + and u.user_name like concat('%', #{params.userName}, '%')