From e5602b4a2d519924e66ea829bb811e7fc7be9d0c Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 1 Jun 2023 19:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC=E5=91=98?= =?UTF-8?q?=E5=88=97=E4=BC=A0=E5=8F=82=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetuser/form/StaffsByOrgAndRolesFormDTO.java | 5 ----- .../epmetuser/result/StaffsByOrgAndRoleRstDTO.java | 2 +- .../dataaggre/service/impl/UserServiceImpl.java | 10 ---------- .../mapper/epmetuser/CustomerStaffDao.xml | 5 +++-- .../epmet/controller/CustomerStaffController.java | 6 +++--- .../java/com/epmet/entity/CustomerStaffEntity.java | 14 ++++++++++++++ 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffsByOrgAndRolesFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffsByOrgAndRolesFormDTO.java index 6ee0c38250..ecd705274c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffsByOrgAndRolesFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffsByOrgAndRolesFormDTO.java @@ -27,11 +27,6 @@ public class StaffsByOrgAndRolesFormDTO { */ private String mobile; - /** - * 工作人员角色 网格员：grid_member、网格长：grid_manager - */ - private String roleType; - /** * 工作类型：专职：fulltime 兼职：parttime */ diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffsByOrgAndRoleRstDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffsByOrgAndRoleRstDTO.java index 4837a3ae86..c7c4cf1a05 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffsByOrgAndRoleRstDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffsByOrgAndRoleRstDTO.java @@ -67,5 +67,5 @@ public class StaffsByOrgAndRoleRstDTO { */ private Integer mediator; - + private String political; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/UserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/UserServiceImpl.java index 83ee51c96f..672722d9ce 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/UserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/UserServiceImpl.java @@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @Service @@ -54,15 +53,6 @@ public class UserServiceImpl implements UserService { // 先通过org库查询出工作人员的id列表 List staffIdsUnderAgency = govOrgService.listStaffIdsUnderAgency(orgIdPath, form.getOrgId()); - //多处调用，判断是否传参 - if (null == form.getRoleKeys() && form.getRoleKeys().size() == 0) { - //如果roleKeys是空，则无传参，判断roleType，如果不为空，添加查询参数 - if (StringUtils.isNotEmpty(form.getRoleType())) { - List roleKeys = new ArrayList<>(); - roleKeys.add(form.getRoleType()); - } - } - // 再通过这些id列表，去过滤角色，并且查出详细信息 return epmetUserService.staffsInRolesFromGivenStaffIds(staffIdsUnderAgency, form); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml index 0e2919bc46..542dceeddf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml @@ -226,10 +226,11 @@ cs.BIRTHDAY, cs.ADDRESS, cs.WORK_TYPE AS workType, - cs.HEAD_PHOTO AS headPhoto + cs.HEAD_PHOTO AS headPhoto, cs.ID_CARD AS idCard, cs.MEMBER, - cs.MEDIATOR + cs.MEDIATOR, + cs.POLITICAL FROM ( SELECT DISTINCT srr.STAFF_ID FROM staff_role srr 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 45e9b098e7..cc174819d8 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 @@ -22,7 +22,6 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.RSASignature; import com.epmet.commons.tools.utils.Result; @@ -58,12 +57,13 @@ import java.util.Map; @RestController @RequestMapping("customerstaff") public class CustomerStaffController { + @Value("${epmet.login.privateKey}") private String privateKey; + @Autowired private CustomerStaffService customerStaffService; - @Autowired - private LoginUserUtil loginUserUtil; + @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java index 37fe661e15..2bf173bd4d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java @@ -141,4 +141,18 @@ public class CustomerStaffEntity extends BaseEpmetEntity { * 出生日期 */ private Date birthday; + + /** + * 是否两委委员 0 否 1 是 + */ + private Integer member; + /** + * 是否调解员 0 否 1 是 + */ + private Integer mediator; + + /** + * 政治面貌 + */ + private String political; }