From 903f99b35c93b24f38493c5e14af9cfc12edb910 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 27 Apr 2020 18:21:08 +0800 Subject: [PATCH] =?UTF-8?q?gov/org//staff/rolelist=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?fulltimeonly=E5=AD=97=E6=AE=B5=E4=B8=94=E7=94=B1sort=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/RoleInfoResultDTO.java | 32 +++++++++++++++++++ .../epmet/dto/result/StaffRoleResultDTO.java | 2 +- .../com/epmet/controller/StaffController.java | 2 +- .../epmet/dao/CustomerStaffDepartmentDao.java | 10 ++++++ .../com/epmet/dao/CustomerStaffGridDao.java | 9 ++++++ .../com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../EpmetUserFeignClientFallBack.java | 2 +- .../java/com/epmet/service/StaffService.java | 2 +- .../service/impl/CustomerGridServiceImpl.java | 18 ++++++++--- .../service/impl/DepartmentServiceImpl.java | 3 +- .../epmet/service/impl/StaffServiceImpl.java | 2 +- .../java/com/epmet/util/ModuleConstant.java | 5 +++ .../mapper/CustomerStaffDepartmentDao.xml | 20 +++++++++++- .../resources/mapper/CustomerStaffGridDao.xml | 22 ++++++++++++- .../java/com/epmet/dto/GovStaffRoleDTO.java | 10 ++++++ .../controller/CustomerStaffController.java | 2 +- .../com/epmet/entity/GovStaffRoleEntity.java | 10 ++++++ .../epmet/service/CustomerStaffService.java | 2 +- .../impl/CustomerStaffServiceImpl.java | 19 +++++++---- .../resources/db/migration/epmet_user.sql | 9 +++++- .../main/resources/mapper/GovStaffRoleDao.xml | 1 + 21 files changed, 161 insertions(+), 23 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java new file mode 100644 index 0000000000..c2378a87a5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName RoleInfoResultDTO + * @Author wangc + * @date 2020.04.27 17:46 + */ +@Data +public class RoleInfoResultDTO implements Serializable{ + private static final long serialVersionUID = 8792889063740125006L; + + /** + * 角色ID + */ + private String roleId; + /** + * 角色名称 + */ + private String roleName; + + /** + * FULL_TIME_ONLY + * */ + @JsonInclude(JsonInclude.Include.NON_NULL) + private Boolean fullTimeOnly = false; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java index 987cde9e3e..9d596bca43 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java @@ -24,7 +24,7 @@ public class StaffRoleResultDTO implements Serializable { /** * true，false专职可选全部 */ - private String fullTimeOnly; + private Boolean fullTimeOnly; /** * 是否选中(选中的是true) */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 39bb61a691..9f9109a7ba 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -58,7 +58,7 @@ public class StaffController { * @return Result */ @PostMapping("rolelist") - public Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ + public Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ return staffService.addStaffInit(fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java index 2f103d1daf..0c6fc36a4b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.CustomerStaffDepartmentDTO; import com.epmet.entity.CustomerStaffDepartmentEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -48,4 +49,13 @@ public interface CustomerStaffDepartmentDao extends BaseDao { * @Date 2020.04.26 14:57 **/ void insertBatch(List list); + + /** + * @Description 根据员工Id和网格Id修改网格工作人员信息 + * @Param CustomerStaffGridDTO + * @return + * @Author wangc + * @Date 2020.04.27 16:43 + **/ + void updateByStaffIdAndGridId(CustomerStaffGridDTO staffGridDTO); } \ No newline at end of file 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 6680257b47..e66536b9ef 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 @@ -83,7 +83,7 @@ public interface EpmetUserFeignClient { * @return Result */ @PostMapping("/epmetuser/customerstaff/rolelist") - Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO); + Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO); /** * 人员编辑页面初始化 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 7765bda523..f0f56a90c0 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 @@ -63,7 +63,7 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { } @Override - public Result> addStaffInit(StaffInfoFromDTO fromDTO) { + public Result> addStaffInit(StaffInfoFromDTO fromDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffInit", fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java index 09e783e520..fc4a17f93d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java @@ -40,7 +40,7 @@ public interface StaffService { * @param fromDTO 参数 * @return Result */ - Result> addStaffInit(StaffInfoFromDTO fromDTO); + Result> addStaffInit(StaffInfoFromDTO fromDTO); /** * 人员编辑页面初始化 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 b5a83ee724..4e4af80612 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 @@ -297,6 +297,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl authResult = authenticateManager(staffInfoFormDTO.getGridId(),staffInfoFormDTO.getUserId()); @@ -308,7 +309,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl authResult = authenticateManager(staffListFormDTO.getGridId(),staffListFormDTO.getUserId()); @@ -338,13 +342,17 @@ public class CustomerGridServiceImpl extends BaseServiceImpl staffIds = new HashSet<>(staffListFormDTO.getSelectedList()); staffIds.removeAll(existedStaffIds); + if(staffIds.size() <= NumConstant.ZERO){ + log.error(ModuleConstant.NO_APPROPRIATE_STAFF_TO_ADD); + return new Result(); + } //3.校验人员是否被禁用 Result> staffsFeignResult = epmetUserFeignClient.enableStaffMsgList(new CommonUserIdListFormDTO( new ArrayList<>(staffIds), authResult.getData().getCustomerId() )); - if(staffsFeignResult.success() && null != staffsFeignResult.getData() && staffsFeignResult.getData().size() > 0){ + if(staffsFeignResult.success() && null != staffsFeignResult.getData() && staffsFeignResult.getData().size() > NumConstant.ZERO){ //4.添加 List validStaffIds = staffsFeignResult.getData() @@ -352,7 +360,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl staffs2Insert = new LinkedList<>(); - for(String id : validStaffIds){ + validStaffIds.forEach(id -> { CustomerStaffGridDTO staff2Insert = new CustomerStaffGridDTO(); staff2Insert.setUserId(id); staff2Insert.setGridId(staffListFormDTO.getGridId()); @@ -360,9 +368,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl> addStaffInit(StaffInfoFromDTO fromDTO) { + public Result> addStaffInit(StaffInfoFromDTO fromDTO) { CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); return epmetUserFeignClient.addStaffInit(fromDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java index 345909e3ec..7cfdbed0a1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java @@ -51,4 +51,9 @@ public interface ModuleConstant { * 找不到相关部门信息 * */ String DEPT_INFO_NOT_FOUND = "找不到相关部门信息"; + + /** + * 没有可添加的人员 + * */ + String NO_APPROPRIATE_STAFF_TO_ADD = "没有可添加的人员(可能原因:选中人员已在网格内)，终止操作。"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml index 6f13998784..09271d9e95 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml @@ -24,5 +24,23 @@ id = #{departmentId} - + + + UPDATE CUSTOMER_STAFF_DEPARTMENT + + + DEL_FLAG = #{delFlag}, + + + UPDATED_BY = #{updatedBy}, + + UPDATED_DATE = NOW() + + WHERE + DEL_FLAG = '0' + AND + DEPARTMENT_ID = #{departmentId} + AND + USER_ID = #{userId} + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml index 5e4c9bd1a3..882c0132f7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml @@ -49,7 +49,7 @@ CUSTOMER_STAFF_GRID WHERE DEL_FLAG = '0' - AND GRID_ID = #{gird} + AND GRID_ID = #{gridId} #{userId} @@ -86,4 +86,24 @@ ) + + + + UPDATE CUSTOMER_STAFF_GRID + + + DEL_FLAG = #{delFlag}, + + + UPDATED_BY = #{updatedBy}, + + UPDATED_TIME = NOW() + + WHERE + USER_ID = #{userId} + AND + GRID_ID = #{gridId} + AND + DEL_FLAG = 0 + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java index 9bc2f4c4de..7021efac58 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/GovStaffRoleDTO.java @@ -58,6 +58,16 @@ public class GovStaffRoleDTO implements Serializable { */ private String orgType; + /** + * 是否只有全职 + * */ + private Boolean fullTimeOnly; + + /** + * 排序 + * */ + private Integer sort; + /** * */ 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 bc9166904b..b4f863d253 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 @@ -193,7 +193,7 @@ public class CustomerStaffController { * @return Result */ @PostMapping("rolelist") - public Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ + public Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ return customerStaffService.addStaffInit(fromDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java index 80ee011dcd..6950c65256 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleEntity.java @@ -58,4 +58,14 @@ public class GovStaffRoleEntity extends BaseEpmetEntity { */ private String orgType; + /** + * 是否只有全职 + * */ + private Boolean fullTimeOnly; + + /** + * 排序 + * */ + private Integer sort; + } 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 65e4bcdd76..21b2a2b1a9 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 @@ -161,7 +161,7 @@ public interface CustomerStaffService extends BaseService { * @param fromDTO 参数 * @return Result */ - Result> addStaffInit(StaffInfoFromDTO fromDTO); + Result> addStaffInit(StaffInfoFromDTO fromDTO); /** * 人员编辑页面初始化 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 eba870a094..c7049bfaf8 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 @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; @@ -201,20 +202,22 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> addStaffInit(StaffInfoFromDTO fromDTO) { + public Result> addStaffInit(StaffInfoFromDTO fromDTO) { GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO(); govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId()); List roleList = govStaffRoleService.getGovStaffRoleList(govStaffRoleDTO); + if (null == roleList || roleList.size() == 0) { - return new Result>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); + return new Result>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); } - List staffRoleList = roleList.stream().map(p -> { - StaffRoleResultDTO staffRoleResultDTO = new StaffRoleResultDTO(); + List staffRoleList = roleList.stream().map(p -> { + RoleInfoResultDTO staffRoleResultDTO = new RoleInfoResultDTO(); staffRoleResultDTO.setRoleId(p.getId()); staffRoleResultDTO.setRoleName(p.getRoleName()); + staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly()); return staffRoleResultDTO; }).collect(Collectors.toList()); - return new Result>().ok(staffRoleList); + return new Result>().ok(staffRoleList); } @Override @@ -410,7 +413,11 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) { - return new Result>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(),userIdList.getCustomerId())); + if (userIdList.getUserIdList().size() <= NumConstant.ZERO) { + return new Result>().ok(new ArrayList<>()); + } + + return new Result>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(),userIdList.getCustomerId())); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql index 4ff85ae479..da3753e9c6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/epmet_user.sql @@ -143,4 +143,11 @@ INSERT INTO `gov_staff_role_template` VALUES ('8', 'grid_member', '网格员', N -- --2020-04-26 ALTER TABLE customer_staff MODIFY COLUMN `EMAIL` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮箱' ; -ALTER TABLE customer_staff MODIFY COLUMN `ADDRESS` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址'; \ No newline at end of file +ALTER TABLE customer_staff MODIFY COLUMN `ADDRESS` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址'; + + +-- --2020-04-27 +ALTER TABLE GOV_STAFF_ROLE ADD ( + FULL_TIME_ONLY tinyint(1) DEFAULT NULL COMMENT '是否只有全职 1对应true 0对应false', + SORT INT DEFAULT NULL COMMENT '排序' +); \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml index 14fe8a45ca..e5c4449733 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml @@ -38,5 +38,6 @@ DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND ORG_TYPE = 'agency' + ORDER BY SORT ASC \ No newline at end of file