成员列表导购查询

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffListDTO.java

@@ -69,6 +69,26 @@ public class StaffListDTO implements Serializable {
      */
     private String endTime;
 
+    private String staffId ;
+
+    private String loginEnterpriseId ;
+
+    public String getLoginEnterpriseId() {
+        return loginEnterpriseId;
+    }
+
+    public void setLoginEnterpriseId(String loginEnterpriseId) {
+        this.loginEnterpriseId = loginEnterpriseId;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
     public String getStartTime() {
         return startTime;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/StaffListBO.java

@@ -73,6 +73,16 @@ public class StaffListBO implements Serializable {
      */
     private String endTime;
 
+    private String staffId ;
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
     public String getStartTime() {
         return startTime;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -212,6 +212,13 @@ public class StaffApiServiceImpl implements StaffApiService {
         //解决空指针异常问题
         Map<String, String> map = list.stream().collect(HashMap::new,(k, v) -> k.put(v.getEnterpriseId(), v.getEnterpriseName()), HashMap::putAll);
         List<StaffClerkRelationDTO> relationDTOList = staffClerkRelationService.listByWxEnterpriseIdAndStaffId(wxEnterpriseId, staffIdList);
+        String loginEnterpriseId = staffListDTO.getLoginEnterpriseId() ;
+        Map<String,ClerkDTO> clerkMap = new HashMap<>() ;
+        if(CollectionUtils.isNotEmpty(relationDTOList)) {
+            Set<String> clerkIdSet = relationDTOList.stream().filter(o->o.getEnterpriseId().equals(loginEnterpriseId)).map(o->o.getClerkId()).collect(Collectors.toSet()) ;
+            List<ClerkDTO> clerkDTOS = this.clerkService.getClerkByIds(clerkIdSet) ;
+            clerkMap.putAll(clerkDTOS.stream().collect(Collectors.toMap(o->o.getClerkId(),o->o,(k1,k2)->k1)));
+        }
         staffDTOList.forEach(one -> {
             if(relationIdList.contains(one.getStaffId())){
                 one.setRelationFlag(1);
@@ -220,6 +227,14 @@ public class StaffApiServiceImpl implements StaffApiService {
                 for (StaffClerkRelationDTO dto : relationDTOList){
                     if (dto.getStaffId().equals(one.getStaffId())){
                         enterpriseNameList.add(map.get(dto.getEnterpriseId()));
+                        if(null != clerkMap.get(dto.getClerkId())) {
+                            String c = one.getClerkCode() ;
+                            if(StringUtils.isBlank(c)) {
+                                one.setClerkCode(clerkMap.get(dto.getClerkId()).getClerkCode());
+                            }else {
+                               one.setClerkCode(c+"、"+clerkMap.get(dto.getClerkId()).getClerkCode());
+                            }
+                        }
                     }
                 }
                 if (CollUtil.isNotEmpty(enterpriseNameList)){

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -307,7 +307,10 @@
         <if test="departmentIds != null and departmentIds.size() > 0">
             left join tab_haoban_staff_department_related b on a.staff_id = b.staff_id and b.status_flag = 1
         </if>
-        where a.wx_enterprise_id = #{wxEnterpriseId} 
+        where a.wx_enterprise_id = #{wxEnterpriseId}
+        <if test="null != staffId">
+            and a.staff_id = #{staffId}
+        </if>
         <if test="occupy == null or 1!=occupy">
 	        and a.status_flag = 1
         </if>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -135,6 +135,13 @@ public class StaffController extends WebBaseController {
         }
         //员工
         StaffListDTO dto = EntityUtil.changeEntityByJSON(StaffListDTO.class, qo);
+        if(StringUtils.isNotBlank(qo.getClerkId())) {
+            StaffClerkRelationDTO clerkRelationDTO = this.staffClerkRelationApiService.getByClerkId(qo.getClerkId()) ;
+            if(null == clerkRelationDTO) {
+                return resultResponse(HaoBanErrCode.ERR_1, PageUtil.getPageInfo(new Page<>()));
+            }
+            dto.setStaffId(clerkRelationDTO.getStaffId());
+        }
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setDepartmentIds(departmentIds);
         if (qo.getGetAllFlag() == 1){
@@ -144,6 +151,7 @@ public class StaffController extends WebBaseController {
             basePageInfo.setPageSize(Integer.MAX_VALUE);
             dto.setPageInfo(basePageInfo);
         }
+        dto.setLoginEnterpriseId(login.getEnterpriseId());
         Page<StaffDTO> page = staffApiService.pageStaff(dto);
 
         logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/StaffListQO.java

@@ -63,6 +63,16 @@ public class StaffListQO implements Serializable {
      */
     private Integer getAllFlag = 0;
 
+    private String clerkId ;
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
     public Integer getGetAllFlag() {
         return getAllFlag;
     }