From d9e4bff1f850f656c8b940de47961bee94080e3d Mon Sep 17 00:00:00 2001 From: zxc <954985705@qq.com> Date: Tue, 28 Apr 2020 12:27:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/AddDepartmentStaffFormDTO.java | 2 +- .../com/epmet/dao/CustomerDepartmentDao.java | 9 +++++++++ .../service/impl/DepartmentServiceImpl.java | 18 +++++++----------- .../resources/mapper/CustomerDepartmentDao.xml | 11 +++++++++++ .../main/resources/mapper/CustomerStaffDao.xml | 6 +++--- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java index 96503be98e..cc23e60a92 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentStaffFormDTO.java @@ -26,6 +26,6 @@ public class AddDepartmentStaffFormDTO implements Serializable { * 选中人员id */ @NotBlank(message = "选中人员不能为空") - private List selectedList; + private List selectedList; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java index 5ecfdff97f..300ea8bf8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.CustomerIdDTO; import com.epmet.dto.result.DepartmentListResultDTO; import com.epmet.dto.result.SubListResultDTO; import com.epmet.entity.CustomerDepartmentEntity; @@ -56,4 +57,12 @@ public interface CustomerDepartmentDao extends BaseDao * @return */ List listDepartmentListByStaffId(@Param("staffId") String staffId); + + /** + * @Description 根据departmentId查询customerId + * @param departmentId + * @author zxc + * @date 2020/4/28 12:26 + */ + CustomerIdDTO selectCustomerIdByDepartmentId(@Param("departmentId") String departmentId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 07dcc028ee..3e8dbaf9d1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -222,20 +222,16 @@ public class DepartmentServiceImpl implements DepartmentService { @Override @Transactional(rollbackFor = Exception.class) public Result addDepartmentStaff(TokenDto tokenDto,AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) { - CustomerStaffDepartmentEntity customerStaffDepartmentEntity = new CustomerStaffDepartmentEntity(); - Result> listResult = epmetUserFeignClient.selectCustomerIdByUserId(addDepartmentStaffFormDTO); - List data = listResult.getData(); - customerStaffDepartmentEntity.setDepartmentId(addDepartmentStaffFormDTO.getDepartmentId()); - customerStaffDepartmentEntity.setCreatedBy(tokenDto.getUserId()); - customerStaffDepartmentEntity.setUpdatedBy(tokenDto.getUserId()); - customerStaffDepartmentEntity.setDelFlag("0"); - customerStaffDepartmentEntity.setRevision(0); - for (CustomerIdDTO customerIdDTO : data) { - customerStaffDepartmentEntity.setUserId(customerIdDTO.getUserId()); + + CustomerIdDTO customerIdDTO = customerDepartmentDao.selectCustomerIdByDepartmentId(addDepartmentStaffFormDTO.getDepartmentId()); + for (String userId : addDepartmentStaffFormDTO.getSelectedList()) { + CustomerStaffDepartmentEntity customerStaffDepartmentEntity = new CustomerStaffDepartmentEntity(); + customerStaffDepartmentEntity.setDepartmentId(addDepartmentStaffFormDTO.getDepartmentId()); customerStaffDepartmentEntity.setCustomerId(customerIdDTO.getCustomerId()); + customerStaffDepartmentEntity.setUserId(userId); customerStaffDepartmentDao.insert(customerStaffDepartmentEntity); } - customerStaffDepartmentDao.updateDepartmentStaffCount(data.size(),addDepartmentStaffFormDTO.getDepartmentId()); + customerStaffDepartmentDao.updateDepartmentStaffCount(addDepartmentStaffFormDTO.getSelectedList().size(),addDepartmentStaffFormDTO.getDepartmentId()); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml index e440745e06..aab4ce8f67 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml @@ -33,4 +33,15 @@ inner join customer_department cd on (csd.DEPARTMENT_ID = cd.ID) where csd.USER_ID = #{staffId} + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index a0acecdc79..d947006ad0 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -27,10 +27,10 @@