app端：1.新增项目下维保工列表

2.修改项目停止服务代码，修改项目组成员相关接口

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/PlatformCompanyLiftRelevanceService.java

@@ -112,32 +112,6 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
         return mapper.selectBatchIds(list);
     }
 
-    /**
-     * @param mtCompanyId 公司id
-     * @param projectId 项目id
-     * @return RestResponse 操作是否成功
-     * @description 确认停止服务
-     * @date 2020/1/11 2:45 下午
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public RestResponse confirm(Long mtCompanyId, Long projectId) {
-        Project project = new Project();
-        project.setId(projectId);
-        //修改项目状态为停止
-        project.setProjectStatus(CommonEnum.ProjectStatus.STOP_SERVICE.getCode());
-        projectService.modify(project);
-        List<PlatformCompanyLiftRelevance> resultList = getCompanyLiftList(mtCompanyId,projectId);
-        resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode()));
-        //批量停保项目下的电梯
-        updateBatchById(resultList);
-        //根据项目id和公司id查询电梯列表
-        List<ProjectLiftRelevance> liftList = projectLiftRelevanceService.findLiftList(mtCompanyId, projectId);
-        Collection<Long> list = liftList.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
-        //批量清除维保计划
-        maintenancePlanService.removeMaintenancePlan(mtCompanyId, list);
-        return RestResponse.success(null, MessageUtils.get("msg.project.operate.success"));
-    }
-
     /**
      * @param request liftIdList 电梯id列表
      * @return 1.成功, 0.失败, 消息描述
@@ -151,7 +125,6 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
         Long mtCompanyId = request.getMtCompanyId();
         Project project = new Project();
         project.setId(projectId);
-        boolean exist = false;
         List<PlatformCompanyLiftRelevance> resultList = getCompanyLiftList(mtCompanyId,projectId);
         switch (operate) {
             //恢复服务
@@ -161,6 +134,8 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
                 if (!judgeResult) {
                     return RestResponse.fail(MessageUtils.get("msg.limit.num"));
                 }
+                project.setStartDate(request.getStartDate());
+                project.setEndDate(request.getEndDate());
                 project.setProjectStatus(CommonEnum.ProjectStatus.IN_SERVICE.getCode());
                 projectService.modify(project);
                 //电梯状态设置为正常
@@ -172,21 +147,27 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
                 break;
             //停止服务
             case "2":
-                for (PlatformCompanyLiftRelevance entry : resultList) {
-                    String liftStatus = entry.getLiftCompanyStatus();
-                    if (CommonEnum.LiftStatus.MAINTENANCE.getCode().equals(liftStatus)) {
-                        return RestResponse.fail(MessageUtils.get("msg.project.lift.maintenance.status.error"));
-                    } else if (CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode().equals(liftStatus)) {
-                        return RestResponse.fail(MessageUtils.get("msg.project.lift.emergency.status.error"));
-                    } else if (CommonEnum.LiftStatus.ANNUAL_INSPECTION.getCode().equals(liftStatus)) {
-                        return RestResponse.fail(MessageUtils.get("msg.project.lift.annualinspection.success.error"));
-                    }
-                    exist = true;
-                }
-                if (exist) confirm(projectId, mtCompanyId);
+                project.setId(projectId);
+                //修改项目状态为停止
+                project.setProjectStatus(CommonEnum.ProjectStatus.STOP_SERVICE.getCode());
+                //设置停止时间及描述
+                project.setEndRemarks(request.getEndRemarks());
+                project.setStopTime(request.getStopTime());
+                projectService.modify(project);
+
+                //批量停保项目下的电梯
+                resultList.forEach(entry -> entry.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode()));
+                updateBatchById(resultList);
+
+                //根据项目id和公司id查询电梯列表
+                List<ProjectLiftRelevance> liftList = projectLiftRelevanceService.findLiftList(mtCompanyId, projectId);
+                Collection<Long> list = liftList.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
+                //批量清除维保计划
+                maintenancePlanService.removeMaintenancePlan(mtCompanyId, list);
                 break;
             //继续服务
             case "3":
+                project.setEndDate(request.getEndDate());
                 project.setProjectStatus(CommonEnum.ProjectStatus.IN_SERVICE.getCode());
                 int response = projectService.modify(project);
                 if (response < 0) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectAppController.java

@@ -10,6 +10,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceR
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.service.MaintenanceRecordService;
+import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectCompanyResponse;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @author bieao
@@ -58,6 +60,21 @@ public class ProjectAppController {
         return RestResponse.success(page, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param request 项目id
+     * @return RestResponse 维保工列表
+     * @description 根据项目id查询项目下维保工
+     * @date 2020/1/14 11:25 上午
+     */
+    @PostMapping("project/user/list")
+    public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
+        List<ProjectAppUser> userList = projectAppService.userList(request.getId());
+        if (CollUtil.isEmpty(userList)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(userList, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request app端新增电梯
      * @return 1.成功, 0.失败, 消息描述

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectController.java

@@ -154,17 +154,6 @@ public class ProjectController {
         return platformService.serviceOperate(request);
     }
 
-    /**
-     * @param request 公司id和项目id
-     * @return 1.成功, 0.失败, 消息描述
-     * @description 确认停止服务
-     * @date 2020/1/11 2:59 下午
-     */
-    @PostMapping("confirm")
-    public RestResponse confirm(@Valid @RequestBody ProjectConfirmRequest request){
-        return platformService.confirm(request.getMtCompanyId(),request.getProjectId());
-    }
-
     /**
      * @param request projectId 项目id
      * @return 1.成功, 0.失败, 消息描述

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectUserController.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.project.controller;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
@@ -35,7 +36,7 @@ public class ProjectUserController {
      */
     @PostMapping("user/list")
     public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
-        List<ProjectUser> userList = projectUserService.userList(request);
+        List<ProjectUser> userList = projectUserService.userList(request.getId());
         if (CollUtil.isEmpty(userList)) {
             return RestResponse.success();
         }
@@ -44,22 +45,22 @@ public class ProjectUserController {
 
 
     /**
-     * @param projectUser 新增项目组成员
+     * @param request 新增项目组成员
      * @return 1.成功, 0.失败, 消息描述
      * @description 新增项目组成员
      * @date 2019/12/4 4:44 PM
      */
-    @PostMapping("/user/add")
-    public RestResponse add(@RequestBody ProjectUser projectUser) {
-        boolean result = projectUserService.add(projectUser);
+    @PostMapping("/user/batch/add")
+    public RestResponse add(@Valid @RequestBody ProjectUserRequest request) {
+        boolean result = projectUserService.add(request);
         if (result) {
-            return RestResponse.success(null, MessageUtils.get("msg.add.success"));
+            return RestResponse.success(null, MessageUtils.get("msg.add.batch.success"));
         }
-        return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+        return RestResponse.fail(MessageUtils.get("msg.add.batch.fail"));
     }
 
     /**
-     * @param projectUser 修改项目组成员
+     * @param projectUser 项目组成员
      * @return Integer 成功1或失败0
      * @description 修改项目组成员
      * @date 2020/1/11 10:43 上午
@@ -74,15 +75,15 @@ public class ProjectUserController {
     }
 
     /**
-     * @param projectUser 修改项目组成员
+     * @param request 项目组成员
      * @return Integer 成功1或失败0
-     * @description 修改项目组成员
+     * @description 删除项目组成员
      * @date 2020/1/11 10:43 上午
      */
-    @PostMapping("/user/remove")
-    public RestResponse remove(@RequestBody ProjectUser projectUser) {
-        boolean result = projectUserService.remove(projectUser);
-        if (result) {
+    @PostMapping("/user/batch/remove")
+    public RestResponse remove(@Valid @RequestBody ProjectUserRequest request) {
+        int result = projectUserService.remove(request);
+        if (result > 0) {
             return RestResponse.success(null, MessageUtils.get("msg.delete.success"));
         }
         return RestResponse.fail(MessageUtils.get("msg.delete.fail"));

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/Project.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 实体类 - 表：project
@@ -151,4 +152,9 @@ public class Project extends BaseEntity {
      * 是否保存
      */
     private Integer save;
+
+    /**
+     * 项目停止时间
+     */
+    private LocalDateTime stopTime;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/ProjectAppUser.java

@@ -9,6 +9,15 @@ import lombok.Data;
  */
 @Data
 public class ProjectAppUser {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 用户id
+     */
+    private String userRole;
     /**
      * 项目成员名称
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectOperateServiceRequest.java

@@ -4,6 +4,8 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author bieao
@@ -31,4 +33,24 @@ public class ProjectOperateServiceRequest {
     @NotNull(message = "notEmpty")
     private Long mtCompanyId;
 
+    /**
+     * 停止服务描述
+     */
+    private String endRemarks;
+
+    /**
+     * 新开始时间
+     */
+    private LocalDate startDate;
+
+    /**
+     * 新结束时间
+     */
+    private LocalDate endDate;
+
+    /**
+     * 项目停止时间
+     */
+    private LocalDateTime stopTime;
+
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectUserRequest.java

@@ -0,0 +1,34 @@
+package cn.com.ty.lift.business.project.dao.entity.model.request;
+
+import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2020/1/13
+ * @description 项目组成员
+ */
+@Data
+public class ProjectUserRequest {
+
+    /**
+     * 项目ID
+     */
+    @NotNull(message = "notEmpty")
+    private Long projectId;
+
+    /**
+     * 维保公司ID
+     */
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
+    /**
+     * 项目组成员
+     */
+    @NotEmpty(message = "notEmpty")
+    private List<ProjectUser> userList;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/response/ProjectDetailResponse.java

@@ -1,10 +1,7 @@
 package cn.com.ty.lift.business.project.dao.entity.model.response;
 
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author bieao
  * @date 2020/1/2
@@ -76,8 +73,4 @@ public class ProjectDetailResponse {
      * 文员
      */
     private String clerkName;
-    /**
-     * 项目人员列表
-     */
-    private List<ProjectAppUser> userList;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/response/ProjectUserResponse.java

@@ -22,7 +22,7 @@ public class ProjectUserResponse {
     /**
      * 用户角色
      */
-    private Byte userRole;
+    private String userRole;
 
     /**
      * 公司ID
@@ -32,7 +32,7 @@ public class ProjectUserResponse {
     /**
      * 是否维保班长
      */
-    private Byte isMonitor;
+    private String isMonitor;
 
     /**
      * 用户姓名

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectUserMapper.java

@@ -2,7 +2,7 @@ package cn.com.ty.lift.business.project.dao.mapper;
 
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,10 +18,12 @@ public interface ProjectUserMapper extends BaseMapper<ProjectUser> {
     List<ProjectUser> findUserListById(@Param("projectId") Long projectId);
 
     /**
-     * @param request 项目id
+     * @param projectId 项目id
      * @return List<ProjectAppUser> 项目成员名称和头像地址
      * @description 根据项目id查询项目人员
      * @date 2020/1/2 10:52 上午
      */
-    List<ProjectAppUser> findProjectUserListById(@Param("request") ProjectDetailRequest request);
+    List<ProjectAppUser> findProjectUserListById(@Param("projectId") Long projectId);
+
+    int batchRemoveWithParams(ProjectUserRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -16,6 +16,7 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectDetailRe
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectLiftResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
+import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -59,6 +61,19 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper,Project> {
         return projectMapper.findListByCompanyId(page, request);
     }
 
+    /**
+     * @param projectId 项目id
+     * @return List<ProjectUser> 项目下维保工
+     * @description 获取项目下维保工
+     * @date 2020/1/14 10:33 上午
+     */
+    public List<ProjectAppUser> userList(Long projectId){
+        List<ProjectAppUser> userList = projectUserMapper.findProjectUserListById(projectId);
+        return userList.stream().filter(
+                entry -> (CommonEnum.DefaultRole.MTWORK.getCode().equals(entry.getUserRole())))
+                .collect(Collectors.toList());
+    }
+
     /**
      * @param request 项目id
      * @return RestResponse 电梯列表
@@ -93,10 +108,7 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2020/1/2 1:50 下午
      */
     public ProjectDetailResponse detail(ProjectDetailRequest request) {
-        ProjectDetailResponse response =  projectMapper.findProjectById(request);
-        List<ProjectAppUser> userList = projectUserMapper.findProjectUserListById(request);
-        response.setUserList(userList);
-        return response;
+        return  projectMapper.findProjectById(request);
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectUserService.java

@@ -1,16 +1,14 @@
 package cn.com.ty.lift.business.project.service;
 
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author bieao
@@ -24,23 +22,28 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
     private ProjectUserMapper projectUserMapper;
 
     /**
-     * @param request projectId 项目ID
+     * @param projectId 项目ID
      * @return List<ProjectUser> userList项目组成员列表
      * @description 查询项目组成员
      * @date 2019/12/13 2:40 PM
      */
-    public List<ProjectUser> userList(ProjectDetailRequest request) {
-        return projectUserMapper.findUserListById(request.getId());
+    public List<ProjectUser> userList(Long projectId) {
+        return projectUserMapper.findUserListById(projectId);
     }
 
     /**
-     * @param projectUser 新增项目组成员
+     * @param request 批量新增项目组成员
      * @return Integer 成功1或失败0
-     * @description 新增项目组成员
+     * @description 批量新增项目组成员
      * @date 2019/12/4 4:41 PM
      */
-    public boolean add(ProjectUser projectUser) {
-        return save(projectUser);
+    public boolean add(ProjectUserRequest request) {
+        List<ProjectUser> userList = request.getUserList();
+        userList.forEach(entry -> {
+            entry.setProjectId(request.getProjectId());
+            entry.setMtCompanyId(request.getMtCompanyId());
+        });
+        return saveBatch(userList);
     }
 
     /**
@@ -58,16 +61,17 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
     }
 
     /**
-     * @param projectUser 删除项目组成员
+     * @param request 批量删除项目组成员
      * @return Integer 成功1或失败0
-     * @description 删除项目组成员
+     * @description 批量删除项目组成员
      * @date 2020/1/11 10:43 上午
      */
-    public boolean remove(ProjectUser projectUser){
-        Map<String, Object> columnMap = new HashMap<>(3);
-        columnMap.put("project_id", projectUser.getProjectId());
-        columnMap.put("user_id", projectUser.getUserId());
-        columnMap.put("user_role", projectUser.getUserRole());
-        return removeByMap(columnMap);
+    public int remove(ProjectUserRequest request) {
+        List<ProjectUser> userList = request.getUserList();
+        userList.forEach(entry -> {
+            entry.setProjectId(request.getProjectId());
+            entry.setMtCompanyId(request.getMtCompanyId());
+        });
+        return projectUserMapper.batchRemoveWithParams(request);
     }
 }

lift-business-service/src/main/resources/locale/response.properties

@@ -23,7 +23,4 @@ msg.company.lift.empty=\u8BE5\u516C\u53F8\u4E0B\u6682\u65F6\u6CA1\u6709\u7535\u6
 msg.error.time=\u9996\u4FDD\u65F6\u95F4\u5E94\u5728\u9879\u76EE\u5F00\u59CB\u65F6\u95F4\u548C\u7ED3\u675F\u65F6\u95F4\u8303\u56F4\u5185
 msg.error.lift.status=\u8BE5\u7535\u68AF\u5DF2\u5F03\u7528
 msg.error.person.scope=\u4EBA\u5458\u4E0D\u5728\u7535\u68AF\u9644\u8FD1\uFF0C\u65E0\u6CD5\u5F00\u59CB\u4FDD\u517B
-msg.project.operate.success=\u670D\u52A1\u64CD\u4F5C\u6210\u529F
-msg.project.lift.maintenance.status.error=\u9879\u76EE\u4E0B\u8FD8\u6709\u7EF4\u4FDD\u4E2D\u7684\u4EFB\u52A1
-msg.project.lift.emergency.status.error=\u9879\u76EE\u4E0B\u8FD8\u6709\u6025\u4FEE\u4E2D\u7684\u4EFB\u52A1
-msg.project.lift.annualinspection.success.error=\u9879\u76EE\u4E0B\u8FD8\u6709\u5E74\u68C0\u4E2D\u7684\u4EFB\u52A1
+msg.project.operate.success=\u670D\u52A1\u64CD\u4F5C\u6210\u529F

lift-business-service/src/main/resources/mapper/project/ProjectUserMapper.xml

@@ -14,13 +14,12 @@
 	</sql>
 
 	<select id="findUserListById" resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse" parameterType="java.lang.Long">
-		SELECT
-		pu.project_id AS projectId,
-		pu.user_id AS userId,
-		pu.user_role AS userRole,
-		pu.mt_company_id AS mtCompanyId,
-		pu.is_monitor AS isMonitor,
-        ui.name AS userName
+		SELECT pu.project_id    AS projectId,
+			   pu.user_id       AS userId,
+			   pu.user_role     AS userRole,
+			   pu.mt_company_id AS mtCompanyId,
+			   pu.is_monitor    AS isMonitor,
+			   ui.name          AS userName
 		FROM project_user pu
 		LEFT JOIN user_info ui ON pu.user_id = ui.user_id
 		WHERE project_id = #{projectId,jdbcType=BIGINT}
@@ -28,13 +27,28 @@
 
 	<!--app端 根据项目id获取项目人员名称和头像地址 -->
 	<select id="findProjectUserListById" resultType="cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser"
-			parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest">
+			parameterType="java.lang.Long">
 		SELECT
 			ui.name,
+		    pu.user_role  AS userRole,
+			pu.user_id    AS userId,
 			ui.avatar_url AS avatarUrl
 		FROM project_user pu
 			 LEFT JOIN user_info ui ON pu.user_id = ui.user_id
-		WHERE project_id = #{request.id,jdbcType=BIGINT}
+		WHERE project_id = #{projectId,jdbcType=BIGINT}
 	</select>
 
+	<!--根据项目id、用户id、用户角色删除项目组成员 -->
+	<delete id="batchRemoveWithParams" parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest">
+			DELETE
+			FROM
+		    project_user
+			WHERE
+			<foreach collection="userList" item="item" index="index" separator="or">
+				( project_id = #{item.projectId}
+				AND user_id = #{item.userId}
+				AND user_role = #{item.userRole} )
+			</foreach>
+	</delete>
+
 </mapper>