打卡记录分页、改表名(promotion_manage_employee ->> manage_employee_info)

src/main/java/com/wangxiaolu/promotion/controller/user/employee/ManageEmployeeQueryController.java

 package com.wangxiaolu.promotion.controller.user.employee;
 
 import com.wangxiaolu.promotion.pojo.activity.manage.vo.ManageEmployeeVo;
-import com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto;
+import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 import com.wangxiaolu.promotion.result.basedata.R;
 import com.wangxiaolu.promotion.service.user.ManageEmployeeQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,13 +23,13 @@ public class ManageEmployeeQueryController {
 
     @PostMapping("/one")
     public R findOne(@RequestBody ManageEmployeeVo manageEmployeeVo){
-        PromotionManageEmployeeDto one = manageEmployeeQueryService.findOne(manageEmployeeVo);
+        ManageEmployeeInfoDto one = manageEmployeeQueryService.findOne(manageEmployeeVo);
         return R.success(one);
     }
 
     @PostMapping("/list")
     public R findList(@RequestBody ManageEmployeeVo manageEmployeeVo){
-        List<PromotionManageEmployeeDto> dtos = manageEmployeeQueryService.findList(manageEmployeeVo);
+        List<ManageEmployeeInfoDto> dtos = manageEmployeeQueryService.findList(manageEmployeeVo);
         return R.success(dtos);
     }
 

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/PromotionManageEmployeeDao.java → src/main/java/com/wangxiaolu/promotion/domain/activity/dao/ManageEmployeeInfoDao.java

 package com.wangxiaolu.promotion.domain.activity.dao;
 
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.ManageEmployeeWrapper;
-import com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto;
+import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 
 import java.util.List;
 
@@ -10,13 +10,13 @@ import java.util.List;
  * @date : 2024-05-29 13
  * @describe :
  */
-public interface PromotionManageEmployeeDao {
-    PromotionManageEmployeeDto loginByEmployeeNo(String employeeNo,String pwd);
+public interface ManageEmployeeInfoDao {
+    ManageEmployeeInfoDto loginByEmployeeNo(String employeeNo, String pwd);
 
-    PromotionManageEmployeeDto selectById(Integer employeeId);
+    ManageEmployeeInfoDto selectById(Integer employeeId);
 
-    PromotionManageEmployeeDto selectOne(ManageEmployeeWrapper ewrap);
+    ManageEmployeeInfoDto selectOne(ManageEmployeeWrapper ewrap);
 
-    List<PromotionManageEmployeeDto> selectList(ManageEmployeeWrapper ewrap);
+    List<ManageEmployeeInfoDto> selectList(ManageEmployeeWrapper ewrap);
 
 }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/PromotionManageEmployeeDaoImpl.java → src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/ManageEmployeeInfoInfoDaoImpl.java

@@ -2,12 +2,12 @@ package com.wangxiaolu.promotion.domain.activity.dao.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.wangxiaolu.promotion.common.util.MD5Utils;
-import com.wangxiaolu.promotion.domain.activity.dao.PromotionManageEmployeeDao;
-import com.wangxiaolu.promotion.domain.activity.mapper.PromotionManageEmployeeMapper;
-import com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO;
+import com.wangxiaolu.promotion.domain.activity.dao.ManageEmployeeInfoDao;
+import com.wangxiaolu.promotion.domain.activity.mapper.ManageEmployeeInfoMapper;
+import com.wangxiaolu.promotion.domain.activity.mapper.entity.ManageEmployeeInfoDO;
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.ManageEmployeeWrapper;
 import com.wangxiaolu.promotion.exception.ParamException;
-import com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto;
+import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 import com.wangxiaolu.promotion.result.basedata.RCode;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,64 +24,67 @@ import java.util.Objects;
  * @describe :
  */
 @Service
-public class PromotionManageEmployeeDaoImpl implements PromotionManageEmployeeDao {
+public class ManageEmployeeInfoInfoDaoImpl implements ManageEmployeeInfoDao {
 
     @Autowired
-    PromotionManageEmployeeMapper promotionManageEmployeeMapper;
+    ManageEmployeeInfoMapper manageEmployeeInfoMapper;
 
     @Override
-    public PromotionManageEmployeeDto loginByEmployeeNo(String employeeNo, String pwd) {
-        PromotionManageEmployeeDO promotionManageEmployeeDO = promotionManageEmployeeMapper.selectToLogin(employeeNo);
+    public ManageEmployeeInfoDto loginByEmployeeNo(String employeeNo, String pwd) {
+        ManageEmployeeInfoDO manageEmployeeInfoDO = manageEmployeeInfoMapper.selectToLogin(employeeNo);
 
-        if (Objects.isNull(promotionManageEmployeeDO)){
+        if (Objects.isNull(manageEmployeeInfoDO)){
             throw new ParamException(RCode.LOGIN_PARAM_ERROR,null);
         }
-        if (!MD5Utils.getSaltverifyMD5(pwd,promotionManageEmployeeDO.getPasswork())){
+        if (!MD5Utils.getSaltverifyMD5(pwd, manageEmployeeInfoDO.getPasswork())){
             throw new ParamException(RCode.LOGIN_PASSWORD_ERROR,null);
         }
 
-        return transitionDto(promotionManageEmployeeDO);
+        return transitionDto(manageEmployeeInfoDO);
     }
 
     @Override
-    public PromotionManageEmployeeDto selectById(Integer employeeId) {
-        return transitionDto(promotionManageEmployeeMapper.selectById(employeeId));
+    public ManageEmployeeInfoDto selectById(Integer employeeId) {
+        return transitionDto(manageEmployeeInfoMapper.selectById(employeeId));
     }
 
     @Override
-    public PromotionManageEmployeeDto selectOne(ManageEmployeeWrapper ewrap) {
-        LambdaQueryWrapper<PromotionManageEmployeeDO> qw = builderOneWrapper(ewrap);
+    public ManageEmployeeInfoDto selectOne(ManageEmployeeWrapper ewrap) {
+        LambdaQueryWrapper<ManageEmployeeInfoDO> qw = builderOneWrapper(ewrap);
         if (qw.isEmptyOfWhere()){
             return null;
         }
-        return transitionDto(promotionManageEmployeeMapper.selectOne(qw));
+        return transitionDto(manageEmployeeInfoMapper.selectOne(qw));
     }
 
     @Override
-    public List<PromotionManageEmployeeDto> selectList(ManageEmployeeWrapper ewrap) {
-        LambdaQueryWrapper<PromotionManageEmployeeDO> qw = builderWrapper(ewrap);
-        List<PromotionManageEmployeeDO> dos = promotionManageEmployeeMapper.selectList(qw);
+    public List<ManageEmployeeInfoDto> selectList(ManageEmployeeWrapper ewrap) {
+        LambdaQueryWrapper<ManageEmployeeInfoDO> qw = builderWrapper(ewrap);
+        List<ManageEmployeeInfoDO> dos = manageEmployeeInfoMapper.selectList(qw);
         return transitionDtos(dos);
     }
 
-    private LambdaQueryWrapper<PromotionManageEmployeeDO> builderOneWrapper(ManageEmployeeWrapper ewrap){
-        LambdaQueryWrapper<PromotionManageEmployeeDO> qw = new LambdaQueryWrapper<>();
+    private LambdaQueryWrapper<ManageEmployeeInfoDO> builderOneWrapper(ManageEmployeeWrapper ewrap){
+        LambdaQueryWrapper<ManageEmployeeInfoDO> qw = new LambdaQueryWrapper<>();
         if (Objects.nonNull(ewrap.getId())){
-            qw.eq(PromotionManageEmployeeDO::getId,ewrap.getId());
+            qw.eq(ManageEmployeeInfoDO::getId,ewrap.getId());
         }
         if (Objects.nonNull(ewrap.getQcId())){
-            qw.eq(PromotionManageEmployeeDO::getQcId,ewrap.getQcId());
+            qw.eq(ManageEmployeeInfoDO::getQcId,ewrap.getQcId());
         }
         if (Objects.nonNull(ewrap.getEmployeeNo())){
-            qw.eq(PromotionManageEmployeeDO::getEmployeeNo,ewrap.getEmployeeNo());
+            qw.eq(ManageEmployeeInfoDO::getEmployeeNo,ewrap.getEmployeeNo());
         }
         return qw;
     }
 
-    private LambdaQueryWrapper<PromotionManageEmployeeDO> builderWrapper(ManageEmployeeWrapper ewrap){
-        LambdaQueryWrapper<PromotionManageEmployeeDO> qw = new LambdaQueryWrapper<>();
+    private LambdaQueryWrapper<ManageEmployeeInfoDO> builderWrapper(ManageEmployeeWrapper ewrap){
+        LambdaQueryWrapper<ManageEmployeeInfoDO> qw = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(ewrap.getId())){
+            qw.eq(ManageEmployeeInfoDO::getId,ewrap.getId());
+        }
         if (ewrap.isHasDeptQcId()){
-            qw.ne(PromotionManageEmployeeDO::getDeptQcId,"");
+            qw.ne(ManageEmployeeInfoDO::getDeptQcId,"");
         }
         return qw;
     }
@@ -92,24 +95,24 @@ public class PromotionManageEmployeeDaoImpl implements PromotionManageEmployeeDa
      * @param dos DO对象List
      * @return DTO对象
      */
-    private List<PromotionManageEmployeeDto> transitionDtos(List<PromotionManageEmployeeDO> dos) {
+    private List<ManageEmployeeInfoDto> transitionDtos(List<ManageEmployeeInfoDO> dos) {
         if (CollectionUtils.isEmpty(dos)) {
             return new ArrayList<>();
         }
 
-        List<PromotionManageEmployeeDto> dtos = new ArrayList<>(dos.size() * 2);
-        for (PromotionManageEmployeeDO edo : dos) {
+        List<ManageEmployeeInfoDto> dtos = new ArrayList<>(dos.size() * 2);
+        for (ManageEmployeeInfoDO edo : dos) {
             dtos.add(transitionDto(edo));
         }
         return dtos;
     }
 
-    private PromotionManageEmployeeDto transitionDto(PromotionManageEmployeeDO employeeDO) {
-        PromotionManageEmployeeDto dto = null;
+    private ManageEmployeeInfoDto transitionDto(ManageEmployeeInfoDO employeeDO) {
+        ManageEmployeeInfoDto dto = null;
         if (Objects.isNull(employeeDO)) {
             return dto;
         }
-        dto = new PromotionManageEmployeeDto();
+        dto = new ManageEmployeeInfoDto();
         BeanUtils.copyProperties(employeeDO, dto);
         return dto;
     }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityClockDaoImpl.java

@@ -2,17 +2,14 @@ package com.wangxiaolu.promotion.domain.activity.dao.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wangxiaolu.promotion.common.enums.StatusType;
 import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao;
 import com.wangxiaolu.promotion.domain.activity.mapper.TemporaryActivityClockMapper;
 import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityClockDO;
-import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityReportedDO;
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
-import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.pojo.PageInfo;
-import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
-import com.wangxiaolu.promotion.result.basedata.RCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -22,7 +19,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -88,18 +84,24 @@ public class TemporaryActivityClockDaoImpl implements TemporaryActivityClockDao
 
     @Override
     public void employeePage(String employeeQcId, PageInfo pageInfo,TemporaryClockWrapper tcw) {
-        int skipNum = pageInfo.getSkipNum();
-        List<TemporaryActivityClockDO> clockDOS = temporaryActivityClockMapper.employeePageFirsd(employeeQcId, pageInfo.getPageSize(), skipNum, tcw);
-        if (Objects.isNull(clockDOS)) {
-            throw new DataException(RCode.DATA_NOT_HAVE_ERROR);
-        }
-
-        List<TemporaryClockDto> temporaryClockDtos = transitionDtos(clockDOS);
-        pageInfo.setRecords(temporaryClockDtos);
-
-        // 查询总数
-        Integer total = temporaryActivityClockMapper.employeePageCount(employeeQcId, pageInfo.getPageSize());
-        pageInfo.setTotalRecord(total);
+        LambdaQueryWrapper<TemporaryActivityClockDO> qw = buildWrapper(tcw);
+        qw.orderByDesc(TemporaryActivityClockDO::getId);
+        Page<TemporaryActivityClockDO> page = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize());
+        Page<TemporaryActivityClockDO> doPage = temporaryActivityClockMapper.selectPage(page, qw);
+        pageInfo.pageCovert(doPage);
+        pageInfo.setRecords(transitionDtos(doPage.getRecords()));
+//        int skipNum = pageInfo.getSkipNum();
+//        List<TemporaryActivityClockDO> clockDOS = temporaryActivityClockMapper.employeePageFirsd(employeeQcId, pageInfo.getPageSize(), skipNum, tcw);
+//        if (Objects.isNull(clockDOS)) {
+//            throw new DataException(RCode.DATA_NOT_HAVE_ERROR);
+//        }
+//
+//        List<TemporaryClockDto> temporaryClockDtos = transitionDtos(clockDOS);
+//        pageInfo.setRecords(temporaryClockDtos);
+//
+//        // 查询总数
+//        Integer total = temporaryActivityClockMapper.employeePageCount(employeeQcId, pageInfo.getPageSize());
+//        pageInfo.setTotalRecord(total);
     }
 
     @Override
@@ -130,6 +132,23 @@ public class TemporaryActivityClockDaoImpl implements TemporaryActivityClockDao
         if (Objects.nonNull(tcw.getReportedId())) {
             qw.eq(TemporaryActivityClockDO::getReportedId, tcw.getReportedId());
         }
+
+        if (Objects.nonNull(tcw.getClockOutTimeIsNull()) && tcw.getClockOutTimeIsNull()){
+            qw.isNull(TemporaryActivityClockDO::getClockOutTime);
+        }
+        if (Objects.nonNull(tcw.getCreateDateStart()) && Objects.nonNull(tcw.getCreateDateEnd())){
+            qw.between(TemporaryActivityClockDO::getCreateDate,tcw.getCreateDateStart(),tcw.getCreateDateEnd());
+        }
+        if (StringUtils.isNotBlank(tcw.getNameLike())){
+            qw.like(TemporaryActivityClockDO::getTemporaryName,tcw.getNameLike());
+        }
+        if (StringUtils.isNotBlank(tcw.getDeptQcId())){
+            qw.eq(TemporaryActivityClockDO::getDeptQcId, tcw.getDeptQcId());
+        }
+        if (StringUtils.isNotBlank(tcw.getChargerQcId())){
+            qw.eq(TemporaryActivityClockDO::getChargerQcId, tcw.getChargerQcId());
+        }
+
         qw.eq(TemporaryActivityClockDO::getIsDelete, StatusType.VALID.getType());
         return qw;
     }

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/PromotionManageEmployeeMapper.java → src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/ManageEmployeeInfoMapper.java

 package com.wangxiaolu.promotion.domain.activity.mapper;
 
-import com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO;
+import com.wangxiaolu.promotion.domain.activity.mapper.entity.ManageEmployeeInfoDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
 /**
 * @author a02200059
-* @description 针对表【promotion_manage_employee(促销平台管理后台员工信息)】的数据库操作Mapper
+* @description 针对表【manage_employee_info(促销平台管理后台员工信息)】的数据库操作Mapper
 * @createDate 2024-05-29 13:24:59
-* @Entity com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO
+* @Entity com.wangxiaolu.promotion.domain.activity.mapper.entity.ManageEmployeeInfoDO
 */
 @Repository
 @Mapper
-public interface PromotionManageEmployeeMapper extends BaseMapper<PromotionManageEmployeeDO> {
+public interface ManageEmployeeInfoMapper extends BaseMapper<ManageEmployeeInfoDO> {
 
-    PromotionManageEmployeeDO selectToLogin(String employeeNo);
+    ManageEmployeeInfoDO selectToLogin(String employeeNo);
 }
 
 

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/PromotionManageEmployeeDO.java → src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/ManageEmployeeInfoDO.java

@@ -12,11 +12,11 @@ import java.util.List;
 /**
  * 促销平台管理后台员工信息
  *
- * @TableName promotion_manage_employee
+ * @TableName manage_employee_info
  */
-@TableName(value = "promotion_manage_employee")
+@TableName(value = "manage_employee_info")
 @Data
-public class PromotionManageEmployeeDO implements Serializable {
+public class ManageEmployeeInfoDO implements Serializable {
     /**
      * 主键id
      */

src/main/java/com/wangxiaolu/promotion/domain/manage/mapper/entity/EmployeeActivityPlanInfoDO.java

@@ -33,7 +33,7 @@ public class EmployeeActivityPlanInfoDO implements Serializable {
     private String excelFiledId;
 
     /**
-     * promotion_manage_employee表id
+     * manage_employee_info表id
      */
     private Integer employeeId;
 

src/main/java/com/wangxiaolu/promotion/domain/manage/mapper/entity/EmployeeActivityPlanRecordDO.java

@@ -22,7 +22,7 @@ public class EmployeeActivityPlanRecordDO implements Serializable {
     private Long id;
 
     /**
-     * promotion_manage_employee表id
+     * manage_employee_info表id
      */
     private Integer employeeId;
 

src/main/java/com/wangxiaolu/promotion/domain/manage/wrapperQo/ActivityPlanInfoWrapper.java

@@ -31,7 +31,7 @@ public class ActivityPlanInfoWrapper {
     private String excelFiledId;
 
     /**
-     * promotion_manage_employee表id
+     * manage_employee_info表id
      */
     private Integer employeeId;
 

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

@@ -83,6 +83,9 @@ public class QinCeEmployeeDaoImpl implements QinCeEmployeeDao {
         if (StringUtils.isNotBlank(ew.getEmpName())){
             qw.like(QinCeEmployeeDO::getEmpName,ew.getEmpName());
         }
+        if (StringUtils.isNotBlank(ew.getQcId())){
+            qw.eq(QinCeEmployeeDO::getQcId,ew.getQcId());
+        }
         qw.eq(QinCeEmployeeDO::getEmpStatus,1);
         qw.last("limit 50");
         return qw;

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

@@ -22,6 +22,7 @@ public class EmployeeWrapper {
      * 对应QinCeDepartmentDO.qcId
      */
     private String waiqin365OrgId;
+    private String qcId;
     private String empName;
 
     /**

src/main/java/com/wangxiaolu/promotion/pojo/activity/manage/dto/EmployeeActivityPlanInfoDto.java

@@ -36,7 +36,7 @@ public class EmployeeActivityPlanInfoDto implements Serializable {
     private String excelFiledId;
 
     /**
-     * promotion_manage_employee表id
+     * manage_employee_info表id
      */
     private Integer employeeId;
 

src/main/java/com/wangxiaolu/promotion/pojo/activity/manage/dto/EmployeeActivityPlanRecordDto.java

@@ -20,7 +20,7 @@ public class EmployeeActivityPlanRecordDto implements Serializable {
     private Long id;
 
     /**
-     * promotion_manage_employee表id
+     * manage_employee_info表id
      */
     private Integer employeeId;
 

src/main/java/com/wangxiaolu/promotion/pojo/activity/manage/vo/ActivityPlanVo.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Accessors(chain = true)
 public class ActivityPlanVo {
     /**
-     * promotion_manage_employee表id
+     * manage_employee_info表id
      */
     private Integer employeeId;
 

src/main/java/com/wangxiaolu/promotion/pojo/user/dto/PromotionManageEmployeeDto.java → src/main/java/com/wangxiaolu/promotion/pojo/user/dto/ManageEmployeeInfoDto.java

@@ -16,7 +16,7 @@ import java.util.List;
 @NoArgsConstructor
 @Accessors(chain = true)
 @Data
-public class PromotionManageEmployeeDto {
+public class ManageEmployeeInfoDto {
     /**
      * 主键id
      */

src/main/java/com/wangxiaolu/promotion/pojo/user/vo/QinceEmployeeQueryVo.java

@@ -14,6 +14,7 @@ public class QinceEmployeeQueryVo {
      * 按部门查询
      */
     private String waiqin365OrgId;
+    private String qcId;
 
     private String empName;
 }

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityClockCoreServiceImpl.java

 package com.wangxiaolu.promotion.service.activity.temporary.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.wangxiaolu.promotion.domain.activity.dao.PromotionManageEmployeeDao;
+import com.wangxiaolu.promotion.domain.activity.dao.ManageEmployeeInfoDao;
 import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao;
 import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityLogDao;
 import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityPhotoDao;
@@ -13,8 +13,7 @@ import com.wangxiaolu.promotion.enums.activity.LogType;
 import com.wangxiaolu.promotion.exception.ParamException;
 import com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanInfoDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
-import com.wangxiaolu.promotion.pojo.activity.temporary.vo.TemporaryClockVo;
-import com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto;
+import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 import com.wangxiaolu.promotion.result.basedata.RCode;
 import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockCoreService;
 import com.wangxiaolu.promotion.utils.OkHttp;
@@ -47,7 +46,7 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
     @Autowired
     private EmployeeActivityPlanInfoDao employeeActivityPlanInfoDao;
     @Autowired
-    private PromotionManageEmployeeDao promotionManageEmployeeDao;
+    private ManageEmployeeInfoDao manageEmployeeInfoDao;
     @Autowired
     private TemporaryActivityLogDao tempActivityLogDao;
     /**
@@ -60,7 +59,7 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
         if (Objects.isNull(dto.getId())) {
             // 补充信息
             EmployeeActivityPlanInfoDto planInfoDto = employeeActivityPlanInfoDao.selectById(dto.getStoreId());
-            PromotionManageEmployeeDto employeeDto = promotionManageEmployeeDao.selectById(planInfoDto.getEmployeeId());
+            ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfoDto.getEmployeeId());
 
             dto.setLineName(planInfoDto.getLineName())
                     .setDeptQcId(employeeDto.getDeptQcId())

src/main/java/com/wangxiaolu/promotion/service/user/ManageEmployeeQueryService.java

 package com.wangxiaolu.promotion.service.user;
 
 import com.wangxiaolu.promotion.pojo.activity.manage.vo.ManageEmployeeVo;
-import com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto;
+import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 
 import java.util.List;
 
@@ -11,8 +11,8 @@ import java.util.List;
  * @describe :
  */
 public interface ManageEmployeeQueryService {
-    PromotionManageEmployeeDto findOne(ManageEmployeeVo manageEmployeeVo);
+    ManageEmployeeInfoDto findOne(ManageEmployeeVo manageEmployeeVo);
 
-    List<PromotionManageEmployeeDto> findList(ManageEmployeeVo manageEmployeeVo);
+    List<ManageEmployeeInfoDto> findList(ManageEmployeeVo manageEmployeeVo);
 
 }

src/main/java/com/wangxiaolu/promotion/service/user/impl/ManageEmployeeQueryServiceImpl.java

 package com.wangxiaolu.promotion.service.user.impl;
 
-import com.wangxiaolu.promotion.domain.activity.dao.PromotionManageEmployeeDao;
+import com.wangxiaolu.promotion.domain.activity.dao.ManageEmployeeInfoDao;
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.ManageEmployeeWrapper;
 import com.wangxiaolu.promotion.pojo.activity.manage.vo.ManageEmployeeVo;
-import com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto;
+import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 import com.wangxiaolu.promotion.service.user.ManageEmployeeQueryService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,19 +20,19 @@ import java.util.List;
 public class ManageEmployeeQueryServiceImpl implements ManageEmployeeQueryService {
 
     @Autowired
-    PromotionManageEmployeeDao promotionManageEmployeeDao;
+    ManageEmployeeInfoDao manageEmployeeInfoDao;
 
     @Override
-    public PromotionManageEmployeeDto findOne(ManageEmployeeVo manageEmployeeVo) {
+    public ManageEmployeeInfoDto findOne(ManageEmployeeVo manageEmployeeVo) {
         ManageEmployeeWrapper ewrap = new ManageEmployeeWrapper();
         BeanUtils.copyProperties(manageEmployeeVo,ewrap);
-        return promotionManageEmployeeDao.selectOne(ewrap);
+        return manageEmployeeInfoDao.selectOne(ewrap);
     }
 
     @Override
-    public List<PromotionManageEmployeeDto> findList(ManageEmployeeVo manageEmployeeVo) {
+    public List<ManageEmployeeInfoDto> findList(ManageEmployeeVo manageEmployeeVo) {
         ManageEmployeeWrapper wrap = new ManageEmployeeWrapper();
         BeanUtils.copyProperties(manageEmployeeVo,wrap);
-        return promotionManageEmployeeDao.selectList(wrap);
+        return manageEmployeeInfoDao.selectList(wrap);
     }
 }

src/main/java/com/wangxiaolu/promotion/service/user/impl/WangxlEmployeeQueryServiceImpl.java

@@ -3,20 +3,15 @@ package com.wangxiaolu.promotion.service.user.impl;
 import com.wangxiaolu.promotion.common.redis.RedisKeys;
 import com.wangxiaolu.promotion.common.redis.service.RedisCache;
 import com.wangxiaolu.promotion.common.util.JwtUtils;
-import com.wangxiaolu.promotion.common.util.MD5Utils;
-import com.wangxiaolu.promotion.domain.activity.dao.PromotionManageEmployeeDao;
-import com.wangxiaolu.promotion.exception.ParamException;
-import com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto;
+import com.wangxiaolu.promotion.domain.activity.dao.ManageEmployeeInfoDao;
+import com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto;
 import com.wangxiaolu.promotion.pojo.user.vo.LoginVo;
 import com.wangxiaolu.promotion.pojo.user.vo.UserLoginParam;
-import com.wangxiaolu.promotion.result.basedata.RCode;
 import com.wangxiaolu.promotion.service.user.WangxlEmployeeQueryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Objects;
-
 /**
  * @author : liqiulin
  * @date : 2024-05-29 13
@@ -30,12 +25,12 @@ public class WangxlEmployeeQueryServiceImpl implements WangxlEmployeeQueryServic
     @Autowired
     JwtUtils jwtUtils;
     @Autowired
-    PromotionManageEmployeeDao promotionManageEmployeeDao;
+    ManageEmployeeInfoDao manageEmployeeInfoDao;
 
 
     @Override
     public LoginVo employeeLoginVerify(UserLoginParam userLoginParam) {
-        PromotionManageEmployeeDto employeeDto = promotionManageEmployeeDao.loginByEmployeeNo(userLoginParam.getLoginName(),userLoginParam.getPassword());
+        ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.loginByEmployeeNo(userLoginParam.getLoginName(),userLoginParam.getPassword());
 
         String loginToken = jwtUtils.getEmployeeToken(userLoginParam.getLoginName(), userLoginParam.getPassword());
         redisCache.addToJsonToMinute(RedisKeys.UserKeys.TEMPORARY_TOKEN.getKey()+loginToken,employeeDto,360);

src/main/resources/mapper/PromotionManageEmployeeMapper.xml → src/main/resources/mapper/ManageEmployeeInfoMapper.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wangxiaolu.promotion.domain.activity.mapper.PromotionManageEmployeeMapper">
+<mapper namespace="com.wangxiaolu.promotion.domain.activity.mapper.ManageEmployeeInfoMapper">
 
     <resultMap id="BaseResultMap"
-               type="com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO">
+               type="com.wangxiaolu.promotion.domain.activity.mapper.entity.ManageEmployeeInfoDO">
         <id property="id" column="id" jdbcType="INTEGER"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="employeeNo" column="employee_no" jdbcType="VARCHAR"/>
@@ -26,7 +26,7 @@
 
     <select id="selectToLogin" resultMap="BaseResultMap">
         select pme.*, merp.privilege
-        from promotion_manage_employee pme
+        from manage_employee_info pme
                  left join manage_employee_ref_privilege merp on pme.id = merp.employee_id
         where employee_no = #{employeeNo};
     </select>