From 84fcc65aa389f8da8b05fb93285dd3513fa8c698 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Tue, 28 Apr 2020 13:22:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=AF=A6=E6=83=85roleNam?= =?UTF-8?q?e=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/UserIdAndPidDTO.java | 48 +++++++++++++++++++ .../java/com/epmet/dao/CustomerGridDao.java | 5 +- .../com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../EpmetUserFeignClientFallBack.java | 2 +- .../service/impl/CustomerGridServiceImpl.java | 2 +- .../main/resources/mapper/CustomerGridDao.xml | 14 +++--- .../com/epmet/constant/UserRoleConstant.java | 35 ++++++++++++++ .../controller/CustomerStaffController.java | 2 +- .../java/com/epmet/dao/CustomerStaffDao.java | 2 +- .../epmet/service/CustomerStaffService.java | 2 +- .../impl/CustomerStaffServiceImpl.java | 14 +++++- 11 files changed, 113 insertions(+), 15 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java new file mode 100644 index 0000000000..af79efc772 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/UserIdAndPidDTO.java @@ -0,0 +1,48 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 网格人员关系表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-20 + */ +@Data +public class UserIdAndPidDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 用户id, user.id + */ + private String userId; + + /** + * pid 所属机关id + */ + private String pid; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 7e4219012e..ecbdbbbad3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.UserIdAndPidDTO; import com.epmet.dto.form.ListCustomerGridFormDTO; import com.epmet.dto.form.SelectGridNameByGridIdFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; @@ -98,11 +99,11 @@ public interface CustomerGridDao extends BaseDao { GridDetailResultDTO griddetail(CustomerGridFormDTO customerGridFormDTO); /** - * 根据gridId查询uerId + * 根据gridId查询uerId和pid * @param customerGridFormDTO * @return */ - List selectUserIdByGridId(CustomerGridFormDTO customerGridFormDTO); + List selectUserIdByGridId(CustomerGridFormDTO customerGridFormDTO); /** * 根据userId查询customerId diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index e66536b9ef..016e0311aa 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -51,7 +51,7 @@ public interface EpmetUserFeignClient { * @return */ @PostMapping("/epmetuser/customerstaff/selectstaffgridlistbyuserid") - Result> getStaffGridList(@RequestBody List customerStaffGridDTOS); + Result> getStaffGridList(@RequestBody List customerStaffGridDTOS); /** * 组织首页-工作人员列表 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java index f0f56a90c0..0cffc90482 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java @@ -37,7 +37,7 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfoByUserId", formDTO); } @Override - public Result> getStaffGridList(List customerStaffGridDTOS) { + public Result> getStaffGridList(List customerStaffGridDTOS) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffGridList", customerStaffGridDTOS); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 3271e2b6f9..2c6090dc9e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -187,7 +187,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl griddetail(CustomerGridFormDTO customerGridFormDTO) { GridDetailResultDTO griddetail = baseDao.griddetail(customerGridFormDTO); - List customerStaffGridDTOS = baseDao.selectUserIdByGridId(customerGridFormDTO); + List customerStaffGridDTOS = baseDao.selectUserIdByGridId(customerGridFormDTO); //获取人员具体信息(头像、名字...) Result> staffGridList = epmetUserFeignClient.getStaffGridList(customerStaffGridDTOS); griddetail.setStaffGridList(staffGridList.getData()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index fc801f289a..7fc3e1beaf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -139,15 +139,17 @@ ORDER BY created_by DESC - - SELECT - user_id + csg.user_id AS userId, + cg.pid FROM - customer_staff_grid + customer_staff_grid csg + LEFT JOIN customer_grid cg ON cg.id = csg.grid_id WHERE - del_flag = 0 - AND grid_id = #{gridId} + csg.del_flag = 0 + AND csg.grid_id = #{gridId} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java index 48b3e77940..878bc9ce5f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java @@ -17,4 +17,39 @@ public interface UserRoleConstant { */ String DEPT_LEADER = "dept_leader"; + /** + * 单位领导 + */ + String AGENCY_LEADER = "agency_leader"; + + /** + * 党建负责人 + */ + String PARTY_PRINCIPALS = "party_principals"; + + /** + * 管理员 + */ + String MANAGER = "manager"; + + /** + * 工作人员 + */ + String STAFF = "staff"; + + /** + * 网格长 + */ + String GRID_MANAGER = "grid_manager"; + + /** + * 网格党建指导员 + */ + String GRID_PARTY_DIRECTOR = "grid_party_director"; + + /** + * 网格员 + */ + String GRID_MEMBER = "grid_member"; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index b4f863d253..27fb54d1fe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -132,7 +132,7 @@ public class CustomerStaffController { * @return */ @PostMapping(value = "selectstaffgridlistbyuserid") - public Result> selectStaffGridListByUserId(@RequestBody List customerStaffGridDTOS){ + public Result> selectStaffGridListByUserId(@RequestBody List customerStaffGridDTOS){ Result> listResult = customerStaffService.selectStaffGridListByUserId(customerStaffGridDTOS); return listResult; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index 7936c026c8..99fbc84718 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -71,7 +71,7 @@ public interface CustomerStaffDao extends BaseDao { * @param customerStaffGridDTOS * @return */ - List selectStaffGridListByUserId(List customerStaffGridDTOS); + List selectStaffGridListByUserId(List customerStaffGridDTOS); /** * 根据用户ID列表获取用户信息 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index 21b2a2b1a9..3acfbd9671 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -139,7 +139,7 @@ public interface CustomerStaffService extends BaseService { * @param customerStaffGridDTOS * @return */ - Result> selectStaffGridListByUserId(List customerStaffGridDTOS); + Result> selectStaffGridListByUserId(List customerStaffGridDTOS); /** * 组织首页-工作人员列表 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 7b7603b823..7a2b47f19d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -178,8 +178,20 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> selectStaffGridListByUserId(List customerStaffGridDTOS) { + public Result> selectStaffGridListByUserId(List customerStaffGridDTOS) { + List gridManager = staffRoleService.listStaffsInRole(UserRoleConstant.GRID_MANAGER, customerStaffGridDTOS.get(0).getPid(), DataScope.getDefault()); List staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS); + for (GovStaffRoleResultDTO govStaffRoleResultDTO : gridManager) { + if (govStaffRoleResultDTO.getRoleKey()==UserRoleConstant.GRID_MANAGER){ + for (StaffGridListDTO staffGridListDTO : staffGridListDTOS) { + if (staffGridListDTO.getStaffId()==govStaffRoleResultDTO.getStaffId()){ + staffGridListDTO.setRoleName(govStaffRoleResultDTO.getRoleName()); + break; + } + break; + } + } + } return new Result>().ok(staffGridListDTOS); } From 70a0dfb8e97607b6f0a801bee672a7397df26d34 Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Tue, 28 Apr 2020 13:34:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=AF=A6=E6=83=85roleNam?= =?UTF-8?q?e=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 7a2b47f19d..8f67616f69 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -186,11 +186,11 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl>().ok(staffGridListDTOS); }