管理后台添加查看促销员列表功能

src/main/java/com/wangxiaolu/promotion/controller/activity/employee/EmployeeQueryTemClockController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Slf4j
 @RestController
-@RequestMapping("/activity/employee/query")
+@RequestMapping("/activity/employee/query/clock")
 public class EmployeeQueryTemClockController {
 
     @Autowired
@@ -23,7 +23,7 @@ public class EmployeeQueryTemClockController {
     /**
      * 查询员工打卡记录
      */
-    @PostMapping("/clock/page")
+    @PostMapping("/page")
     public R findClockList(@RequestHeader("loginQcId") String loginQcId, @RequestBody PageInfo pageInfo) {
         employeeQueryTemClockService.findClockList(loginQcId, pageInfo);
         return R.success(pageInfo);

src/main/java/com/wangxiaolu/promotion/controller/activity/employee/EmployeeQueryTemporaryInfoController.java

+package com.wangxiaolu.promotion.controller.activity.employee;
+
+import com.wangxiaolu.promotion.pojo.PageInfo;
+import com.wangxiaolu.promotion.result.basedata.R;
+import com.wangxiaolu.promotion.service.activity.employee.EmployeeQueryTemporaryInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-06-13 10
+ * @describe : 员工查询促销员信息
+ */
+@Slf4j
+@RestController
+@RequestMapping("/activity/employee/query/temporary")
+public class EmployeeQueryTemporaryInfoController {
+
+    @Autowired
+    EmployeeQueryTemporaryInfoService employeeQueryTemporaryInfoService;
+
+
+    /**
+     * 查询负责的促销员列表
+     */
+    @PostMapping("/page")
+    public R findTemporaryInfoPage(@RequestHeader("loginQcId") String loginQcId, @RequestBody PageInfo pageInfo) {
+        employeeQueryTemporaryInfoService.findTemporaryInfoPage(loginQcId, pageInfo);
+        return R.success(pageInfo);
+    }
+}

src/main/java/com/wangxiaolu/promotion/domain/user/dao/TemporaryInfoDao.java

 package com.wangxiaolu.promotion.domain.user.dao;
 
+import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
 
 /**
@@ -14,15 +15,12 @@ public interface TemporaryInfoDao {
      */
     int saveWxTemporaryInfo(WxTemporaryInfoDto temporaryDto);
 
-    /**
-     * 根据OpenId查询人员是否存在(非保密信息)
-     */
-    WxTemporaryInfoDto getUnimportantData(String openId);
-
     /**
      * 根据OpenId、phone查询人员是否存在(非保密信息)
      */
     WxTemporaryInfoDto getUnimportantData(String openId,String phone);
 
     WxTemporaryInfoDto selectOneById(Integer id);
+
+    void findTemporaryInfoByEmployeeQcId(String employeeQcId, PageInfo pageInfo);
 }

src/main/java/com/wangxiaolu/promotion/domain/user/dao/impl/TemporaryInfoDaoImpl.java

 package com.wangxiaolu.promotion.domain.user.dao.impl;
 
-import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityReportedDO;
 import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
 import com.wangxiaolu.promotion.domain.user.mapper.TemporaryInfoMapper;
 import com.wangxiaolu.promotion.domain.user.mapper.entity.TemporaryInfoDO;
 import com.wangxiaolu.promotion.domain.user.wrapperQo.TemporaryWrapper;
+import com.wangxiaolu.promotion.pojo.PageInfo;
+import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
 import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -34,12 +40,6 @@ public class TemporaryInfoDaoImpl implements TemporaryInfoDao {
         return temporaryInfoMapper.insert(entity);
     }
 
-    @Override
-    public WxTemporaryInfoDto getUnimportantData(String openId) {
-        TemporaryInfoDO temDo = temporaryInfoMapper.getUnimportantData(openId);
-        return transitionDto(temDo);
-    }
-
     @Override
     public WxTemporaryInfoDto getUnimportantData(String openId, String phone) {
         TemporaryWrapper tw = new TemporaryWrapper().setOpenId(openId).setPhone(phone);
@@ -54,17 +54,47 @@ public class TemporaryInfoDaoImpl implements TemporaryInfoDao {
         return transitionDto(temDo);
     }
 
+    @Override
+    public void findTemporaryInfoByEmployeeQcId(String employeeQcId, PageInfo pageInfo) {
+        TemporaryWrapper tw = new TemporaryWrapper()
+                .setChargerQcId(employeeQcId);
+        LambdaQueryWrapper<TemporaryInfoDO> qw = buildQueryList(tw);
+        List<TemporaryInfoDO> temporaryInfoDOS = temporaryInfoMapper.selectList(qw);
+        pageInfo.setRecords(transitionDtos(temporaryInfoDOS));
+    }
+
     private LambdaQueryWrapper<TemporaryInfoDO> buildQueryList(TemporaryWrapper tw){
         LambdaQueryWrapper<TemporaryInfoDO> queryWrapper = new LambdaQueryWrapper<>();
-        if (!StringUtils.isEmpty(tw.getOpenId())){
+        if (StringUtils.isNotBlank(tw.getOpenId())){
             queryWrapper.eq(TemporaryInfoDO::getOpenId,tw.getOpenId());
         }
-        if (!StringUtils.isEmpty(tw.getPhone())){
+        if (StringUtils.isNotBlank(tw.getPhone())){
             queryWrapper.eq(TemporaryInfoDO::getPhone,tw.getPhone());
         }
+        if (StringUtils.isNotBlank(tw.getChargerQcId())){
+            queryWrapper.eq(TemporaryInfoDO::getChargerQcId,tw.getChargerQcId());
+        }
         return queryWrapper;
     }
 
+    /**
+     * DO to DTO (单个对象)
+     *
+     * @param temDos DO对象List
+     * @return DTO对象
+     */
+    private List<WxTemporaryInfoDto> transitionDtos(List<TemporaryInfoDO> temDos) {
+        if (CollectionUtils.isEmpty(temDos)) {
+            return new ArrayList<>();
+        }
+
+        List<WxTemporaryInfoDto> dtos = new ArrayList<>(temDos.size() * 2);
+        for (TemporaryInfoDO temDo : temDos) {
+            dtos.add(transitionDto(temDo));
+        }
+        return dtos;
+    }
+
     /**
      * DO to DTO (单个对象)
      * @param temDo DO对象

src/main/java/com/wangxiaolu/promotion/domain/user/wrapperQo/TemporaryWrapper.java

@@ -23,5 +23,8 @@ public class TemporaryWrapper {
      * 手机号
      */
     String phone;
-
+    /**
+     * 此促销员的任务人-勤策id
+     */
+    String chargerQcId;
 }

src/main/java/com/wangxiaolu/promotion/service/activity/employee/EmployeeQueryTemporaryInfoService.java

+package com.wangxiaolu.promotion.service.activity.employee;
+
+import com.wangxiaolu.promotion.pojo.PageInfo;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-06-13 10
+ * @describe :
+ */
+public interface EmployeeQueryTemporaryInfoService {
+    void findTemporaryInfoPage(String employeeQcId, PageInfo pageInfo);
+}

src/main/java/com/wangxiaolu/promotion/service/activity/employee/impl/EmployeeQueryTemporaryInfoServiceImpl.java

+package com.wangxiaolu.promotion.service.activity.employee.impl;
+
+import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
+import com.wangxiaolu.promotion.pojo.PageInfo;
+import com.wangxiaolu.promotion.service.activity.employee.EmployeeQueryTemporaryInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : liqiulin
+ * @date : 2024-06-13 10
+ * @describe : 员工查询促销员信息
+ */
+@Service
+public class EmployeeQueryTemporaryInfoServiceImpl implements EmployeeQueryTemporaryInfoService {
+
+    @Autowired
+    TemporaryInfoDao temporaryInfoDao;
+
+    @Override
+    public void findTemporaryInfoPage(String employeeQcId, PageInfo pageInfo) {
+        temporaryInfoDao.findTemporaryInfoByEmployeeQcId(employeeQcId, pageInfo);
+    }
+}