员工查看审批列表(分页)查询

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

 package com.wangxiaolu.promotion.controller.activity.employee;
 
-import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
+import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.result.basedata.R;
 import com.wangxiaolu.promotion.service.activity.employee.EmployeeQueryTemActivityService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @author : liqiulin
  * @date : 2024-05-29 14
@@ -22,12 +20,16 @@ public class EmployeeQueryTemActivityController {
     @Autowired
     EmployeeQueryTemActivityService employeeQueryTemActivityService;
 
-
-    @GetMapping("/all")
-    public R findActivitys(@RequestHeader String loginQcId) {
-        List<TemporaryActivityReportedDto> dtos = employeeQueryTemActivityService.getEmployeeApproveActivitys(loginQcId);
-        return R.success(dtos);
+    /**
+     * 查询员工负责审批的活动数据
+     *
+     * @param loginQcId 员工
+     * @return 活动数据
+     */
+    @PostMapping("/page")
+    public R findActivitys(@RequestHeader("loginQcId") String loginQcId, @RequestBody PageInfo pageInfo) {
+        employeeQueryTemActivityService.getEmployeeApproveActivityPage(loginQcId, pageInfo);
+        return R.success(pageInfo);
     }
 
-
 }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/TemporaryActivityReportedDao.java

@@ -37,5 +37,5 @@ public interface TemporaryActivityReportedDao {
      */
     void updateById(TemporaryActivityReportedDto temActDto);
 
-    List<TemporaryActivityReportedDto> findListToEmployee(TemporaryActivityWrapper tw);
+    void findListToEmployeePage(TemporaryActivityWrapper tw, PageInfo pageInfo);
 }

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

@@ -92,7 +92,7 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
     public void updateById(TemporaryActivityReportedDto temActDto) {
         TemporaryActivityReportedDO rDo = new TemporaryActivityReportedDO();
         BeanUtils.copyProperties(temActDto, rDo);
-        if (Objects.nonNull(temActDto.getApproveStatus())){
+        if (Objects.nonNull(temActDto.getApproveStatus())) {
             rDo.setApproveStatus(temActDto.getApproveStatus().name());
         }
         rDo.setModifyTime(new Date());
@@ -101,15 +101,18 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
 
     /**
      * 员工查询、
+     *
      * @param tw
      * @return
      */
     @Override
-    public List<TemporaryActivityReportedDto> findListToEmployee(TemporaryActivityWrapper tw) {
+    public void findListToEmployeePage(TemporaryActivityWrapper tw, PageInfo pageInfo) {
         LambdaQueryWrapper<TemporaryActivityReportedDO> qw = buildQueryList(tw);
         qw.orderByDesc(TemporaryActivityReportedDO::getApproveStatus);
-        List<TemporaryActivityReportedDO> dos = temporaryActivityReportedMapper.selectList(qw);
-        return transitionDtos(dos);
+        Page<TemporaryActivityReportedDO> page = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize());
+        Page<TemporaryActivityReportedDO> temDoPage = temporaryActivityReportedMapper.selectPage(page, qw);
+        pageInfo.pageCovert(temDoPage);
+        pageInfo.setRecords(transitionDtos(temDoPage.getRecords()));
     }
 
 
@@ -121,13 +124,13 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         if (!StringUtils.isEmpty(tw.getCreateDate())) {
             queryWrapper.eq(TemporaryActivityReportedDO::getCreateDate, tw.getCreateDate());
         }
-        if (!StringUtils.isEmpty(tw.getApproveStatus())){
+        if (!StringUtils.isEmpty(tw.getApproveStatus())) {
             queryWrapper.eq(TemporaryActivityReportedDO::getApproveStatus, tw.getApproveStatus());
         }
-        if (!StringUtils.isEmpty(tw.getApproverId())){
+        if (!StringUtils.isEmpty(tw.getApproverId())) {
             queryWrapper.eq(TemporaryActivityReportedDO::getApproverId, tw.getApproverId());
         }
-        if (!StringUtils.isEmpty(tw.getNotApproveStatus())){
+        if (!StringUtils.isEmpty(tw.getNotApproveStatus())) {
             queryWrapper.ne(TemporaryActivityReportedDO::getApproveStatus, tw.getNotApproveStatus());
         }
 

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

 package com.wangxiaolu.promotion.service.activity.employee;
 
-import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
-
-import java.util.List;
+import com.wangxiaolu.promotion.pojo.PageInfo;
 
 /**
  * @author : liqiulin
@@ -11,6 +9,5 @@ import java.util.List;
  */
 public interface EmployeeQueryTemActivityService {
 
-
-    List<TemporaryActivityReportedDto> getEmployeeApproveActivitys(String employeeQcId);
+    void getEmployeeApproveActivityPage(String employeeQcId, PageInfo pageInfo);
 }

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

 package com.wangxiaolu.promotion.service.activity.employee.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityReportedDao;
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryActivityWrapper;
 import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus;
-import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
+import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.service.activity.employee.EmployeeQueryTemActivityService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.Objects;
 
 /**
  * @author : liqiulin
@@ -18,16 +19,17 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class EmployeeQueryTemActivityServiceImpl implements EmployeeQueryTemActivityService{
+public class EmployeeQueryTemActivityServiceImpl implements EmployeeQueryTemActivityService {
 
     @Autowired
     TemporaryActivityReportedDao temporaryActivityReportedDao;
 
     @Override
-    public List<TemporaryActivityReportedDto> getEmployeeApproveActivitys(String employeeQcId) {
-        TemporaryActivityWrapper tw = new TemporaryActivityWrapper()
-                .setApproverId(employeeQcId)
+    public void getEmployeeApproveActivityPage(String employeeQcId, PageInfo pageInfo) {
+        TemporaryActivityWrapper tw = JSONObject.parseObject(JSONObject.toJSONString(pageInfo.getQueryParams()), TemporaryActivityWrapper.class);
+        tw = Objects.isNull(tw) ? new TemporaryActivityWrapper() : tw;
+        tw.setApproverId(employeeQcId)
                 .setNotApproveStatus(TemActApproveStatus.SUBMITTED.name());
-        return temporaryActivityReportedDao.findListToEmployee(tw);
+        temporaryActivityReportedDao.findListToEmployeePage(tw, pageInfo);
     }
 }