gov/org//staff/rolelist接口返回对象中添加fulltimeonly字段且由sort排序

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;
+}

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)
 	 */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -58,7 +58,7 @@ public class StaffController {
 	 * @return Result<StaffInitResultDTO>
 	 */
 	@PostMapping("rolelist")
-	public Result<List<StaffRoleResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
+	public Result<List<RoleInfoResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
 		return staffService.addStaffInit(fromDTO);
 	}
 

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<CustomerStaffDepartm
      * @auther zxc
      */
     void updateDepartmentStaffCount(@Param("addCount")Integer addCount,@Param("departmentId")String departmentId);
+
+    /**
+     * @Description 根据部门Id和用户Id修改部门工作人员信息
+     * @Param CustomerStaffDepartmentDTO
+     * @return
+     * @Author wangc
+     * @Date 2020.04.27 16:54
+     **/
+    void updateByDeptIdAndUserId(CustomerStaffDepartmentDTO staffDepartmentDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java

@@ -65,4 +65,13 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      * @Date 2020.04.26 14:57
      **/
     void insertBatch(List<CustomerStaffGridDTO> list);
+
+    /**
+     * @Description 根据员工Id和网格Id修改网格工作人员信息
+     * @Param CustomerStaffGridDTO
+     * @return
+     * @Author wangc
+     * @Date 2020.04.27 16:43
+     **/
+    void updateByStaffIdAndGridId(CustomerStaffGridDTO staffGridDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -83,7 +83,7 @@ public interface EpmetUserFeignClient {
 	 * @return Result<StaffInitResultDTO>
 	 */
 	@PostMapping("/epmetuser/customerstaff/rolelist")
-	Result<List<StaffRoleResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO);
+	Result<List<RoleInfoResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO);
 
 	/**
 	 * 人员编辑页面初始化

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<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
+    public Result<List<RoleInfoResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffInit", fromDTO);
     }
 

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<StaffInitResultDTO>
 	 */
-	Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO);
+	Result<List<RoleInfoResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO);
 
 	/**
 	 * 人员编辑页面初始化

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<CustomerGridDao, Cu
      * @Date 2020.04.26 09:48
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result removeGridStaff(CommonGridStaffInfoFormDTO staffInfoFormDTO) {
 
         Result<CustomerGridEntity> authResult = authenticateManager(staffInfoFormDTO.getGridId(),staffInfoFormDTO.getUserId());
@@ -308,7 +309,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             staff.setGridId(staffInfoFormDTO.getGridId());
             staff.setUpdatedBy(staffInfoFormDTO.getUserId());
             staff.setDelFlag(NumConstant.ONE);
-            customerStaffGridService.update(staff);
+            customerStaffGridDao.updateByStaffIdAndGridId(staff);
             //3.2 人数减一
             CustomerGridDTO grid = new CustomerGridDTO();
             grid.setId(authResult.getData().getId());
@@ -316,6 +317,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             grid.setTotalUser(authResult.getData().getTotalUser() == null || authResult.getData().getTotalUser() <= 0
                     ? 0 : (authResult.getData().getTotalUser() - 1));
             update(grid);
+
+            return new Result();
         }
 
         return new Result().error();
@@ -329,6 +332,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
      * @Date 2020.04.26 09:50
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result addGridStaffs(CommonGridStaffListFromDTO staffListFormDTO) {
         //1.校验管理员权限
         Result<CustomerGridEntity> authResult = authenticateManager(staffListFormDTO.getGridId(),staffListFormDTO.getUserId());
@@ -338,13 +342,17 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             customerStaffGridDao.distinctGridStaffs(staffListFormDTO.getSelectedList(),staffListFormDTO.getGridId());
             Set<String> 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<List<CommonStaffInfoResultDTO>> 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<String> validStaffIds =
                         staffsFeignResult.getData()
@@ -352,7 +360,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
                                 .map(CommonStaffInfoResultDTO::getStaffId)
                                 .collect(Collectors.toList());
                 List<CustomerStaffGridDTO> 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<CustomerGridDao, Cu
                     staff2Insert.setCreatedBy(staffListFormDTO.getUserId());
                     staff2Insert.setUpdatedBy(staffListFormDTO.getUserId());
                     staffs2Insert.add(staff2Insert);
-                }
+                });
                 //4.1 批量新增网格工作人员
                 customerStaffGridDao.insertBatch(staffs2Insert);
+                //4.2 更新网格人数
                 CustomerGridDTO grid2Update = new CustomerGridDTO();
                 grid2Update.setId(staffListFormDTO.getGridId());
                 grid2Update.setUpdatedBy(staffListFormDTO.getUserId());
@@ -370,7 +379,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
                        null == authResult.getData().getTotalUser() ?
                                validStaffIds.size() : authResult.getData().getTotalUser() + validStaffIds.size()
                 );
-                //4.2 更新网格人数
                 update(grid2Update);
                 return new Result();
             }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java

@@ -247,6 +247,7 @@ public class DepartmentServiceImpl implements DepartmentService {
      * @Date 2020.04.26 16:57
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result removeStaff(CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO) {
         //1.剔除工作人员
         CustomerStaffDepartmentDTO staff = new CustomerStaffDepartmentDTO();
@@ -254,7 +255,7 @@ public class DepartmentServiceImpl implements DepartmentService {
         staff.setDepartmentId(departmentStaffInfoFormDTO.getDepartmentId());
         staff.setUpdatedBy(departmentStaffInfoFormDTO.getUserId());
         staff.setDelFlag(NumConstant.ONE_STR);
-        customerStaffDepartmentService.update(staff);
+        customerStaffDepartmentDao.updateByDeptIdAndUserId(staff);
         //2.部门人数减一
         CustomerDepartmentDTO dept =
         customerDepartmentService.get(departmentStaffInfoFormDTO.getDepartmentId());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -86,7 +86,7 @@ public class StaffServiceImpl implements StaffService {
 	}
 
 	@Override
-	public Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
+	public Result<List<RoleInfoResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
 		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
 		return epmetUserFeignClient.addStaffInit(fromDTO);

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 = "没有可添加的人员(可能原因:选中人员已在网格内)，终止操作。";
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml

@@ -24,5 +24,23 @@
             id = #{departmentId}
     </update>
 
-
+    <!-- 根据部门Id和用户Id修改部门工作人员信息 -->
+    <update id="updateByDeptIdAndUserId" parameterType="com.epmet.dto.CustomerStaffDepartmentDTO">
+        UPDATE CUSTOMER_STAFF_DEPARTMENT
+        <set>
+            <if test='delFlag != null'>
+                DEL_FLAG = #{delFlag},
+            </if>
+            <if test='null != updatedBy and "" != updatedBy'>
+                UPDATED_BY = #{updatedBy},
+            </if>
+                UPDATED_DATE = NOW()
+        </set>
+        WHERE
+        DEL_FLAG = '0'
+        AND
+        DEPARTMENT_ID = #{departmentId}
+        AND
+        USER_ID = #{userId}
+    </update>
 </mapper>

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}
         <foreach collection="userIds" item="userId" open="AND USER_ID IN (" separator="," close=")">
             #{userId}
         </foreach>
@@ -86,4 +86,24 @@
             )
         </foreach>
     </insert>
+
+    <!-- 根据员工Id和网格Id修改网格工作人员信息 -->
+    <update id="updateByStaffIdAndGridId" parameterType="com.epmet.dto.CustomerStaffGridDTO">
+        UPDATE CUSTOMER_STAFF_GRID
+        <set>
+            <if test='delFlag != null'>
+               DEL_FLAG = #{delFlag},
+            </if>
+            <if test='updatedBy != null and updatedBy != ""'>
+               UPDATED_BY = #{updatedBy},
+            </if>
+               UPDATED_TIME = NOW()
+        </set>
+        WHERE
+        USER_ID = #{userId}
+        AND
+        GRID_ID = #{gridId}
+        AND
+        DEL_FLAG = 0
+    </update>
 </mapper>

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;
+
     /**
      * 
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -193,7 +193,7 @@ public class CustomerStaffController {
      * @return Result<StaffInitResultDTO>
      */
     @PostMapping("rolelist")
-    public Result<List<StaffRoleResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
+    public Result<List<RoleInfoResultDTO>> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){
         return customerStaffService.addStaffInit(fromDTO);
     }
 

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;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -161,7 +161,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @param fromDTO 参数
 	 * @return Result<StaffInitResultDTO>
 	 */
-	Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO);
+	Result<List<RoleInfoResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO);
 
 	/**
 	 * 人员编辑页面初始化

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<CustomerStaffDao,
 	}
 
 	@Override
-	public Result<List<StaffRoleResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
+	public Result<List<RoleInfoResultDTO>> addStaffInit(StaffInfoFromDTO fromDTO) {
 		GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO();
 		govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId());
 		List<GovStaffRoleDTO> roleList = govStaffRoleService.getGovStaffRoleList(govStaffRoleDTO);
+
 		if (null == roleList || roleList.size() == 0) {
-			return new Result<List<StaffRoleResultDTO>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
+			return new Result<List<RoleInfoResultDTO>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
-		List<StaffRoleResultDTO> staffRoleList = roleList.stream().map(p -> {
-			StaffRoleResultDTO staffRoleResultDTO = new StaffRoleResultDTO();
+		List<RoleInfoResultDTO> 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<List<StaffRoleResultDTO>>().ok(staffRoleList);
+		return new Result<List<RoleInfoResultDTO>>().ok(staffRoleList);
 	}
 
 	@Override
@@ -410,7 +413,11 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
      **/
     @Override
     public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) {
-        return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(),userIdList.getCustomerId()));
+		if (userIdList.getUserIdList().size() <= NumConstant.ZERO) {
+			return new Result<List<CommonStaffInfoResultDTO>>().ok(new ArrayList<>());
+		}
+
+		return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(),userIdList.getCustomerId()));
     }
 
 }

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 '地址';
+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 '排序'
+);

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
     </select>
 </mapper>