管理员模块：查询打卡列表分别查询全部打卡/打卡未完成的2种数据；查询上报数据增加返回只保存未审批的上报数据

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

@@ -31,6 +31,6 @@ public interface TemporaryActivityClockDao {
     /**
      * 员工查询负责的促销员打卡信息（分页查询）
      */
-    void employeePage(String employeeQcId, PageInfo pageInfo);
+    void employeePage(String employeeQcId, PageInfo pageInfo,TemporaryClockWrapper tcw);
 
 }

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

@@ -73,14 +73,9 @@ public class TemporaryActivityClockDaoImpl implements TemporaryActivityClockDao
     }
 
     @Override
-    public void employeePage(String employeeQcId, PageInfo pageInfo) {
-//        pagesize*(pageIndex - 1)
-//        int pageSize = pageInfo.getPageSize();
-//        int pageNum = pageInfo.getPageNum();
-//        int skipNum = pageSize * (pageNum - 1);
+    public void employeePage(String employeeQcId, PageInfo pageInfo,TemporaryClockWrapper tcw) {
         int skipNum = pageInfo.getSkipNum();
-
-        List<TemporaryActivityClockDO> clockDOS = temporaryActivityClockMapper.employeePageFirsd(employeeQcId, pageInfo.getPageSize(), skipNum);
+        List<TemporaryActivityClockDO> clockDOS = temporaryActivityClockMapper.employeePageFirsd(employeeQcId, pageInfo.getPageSize(), skipNum, tcw);
         if (Objects.isNull(clockDOS)) {
             throw new DataException(RCode.DATA_NOT_HAVE_ERROR);
         }

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/TemporaryActivityClockMapper.java

@@ -2,6 +2,7 @@ package com.wangxiaolu.promotion.domain.activity.mapper;
 
 import com.wangxiaolu.promotion.domain.activity.mapper.entity.TemporaryActivityClockDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -18,7 +19,7 @@ import java.util.List;
 @Repository
 public interface TemporaryActivityClockMapper extends BaseMapper<TemporaryActivityClockDO> {
 
-    List<TemporaryActivityClockDO> employeePageFirsd(@Param("employeeQcId") String employeeQcId, @Param("pageSize") int pageSize, @Param("skipNum") int skipNum);
+    List<TemporaryActivityClockDO> employeePageFirsd(@Param("employeeQcId") String employeeQcId, @Param("pageSize") int pageSize, @Param("skipNum") int skipNum, @Param("tcw") TemporaryClockWrapper tcw);
 
     //    List<TemporaryActivityClockDO> employeePage(@Param("employeeQcId") String employeeQcId, @Param("pageSize") int pageSize, @Param("maxId") Integer maxId);
     Integer employeePageCount(@Param("employeeQcId") String employeeQcId, @Param("pageSize") int pageSize);

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryClockWrapper.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author : liqiulin
  * @date : 2024-04-23 19
@@ -30,4 +32,9 @@ public class TemporaryClockWrapper {
      * 创建日期YYYY-MM-DD
      */
     private String createDate;
+
+    /**
+     * 下班卡=null
+     */
+    private Boolean clockOutTimeIsNull;
 }

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

@@ -42,7 +42,7 @@ public class EmployeeQueryTemActivityServiceImpl implements EmployeeQueryTemActi
     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.setNotApproveStatus(TemActApproveStatus.SUBMITTED.name());
+//        tw.setNotApproveStatus(TemActApproveStatus.SUBMITTED.name());
         temporaryActivityReportedDao.findPage(tw, pageInfo);
 
         // 查询活动记录关联的售卖单元列表（一次性查出）

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

 package com.wangxiaolu.promotion.service.activity.employee.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.wangxiaolu.promotion.domain.activity.dao.TemporaryActivityClockDao;
+import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.service.activity.employee.EmployeeQueryTemClockService;
 import lombok.extern.slf4j.Slf4j;
@@ -21,7 +23,8 @@ public class EmployeeQueryTemClockServiceImpl implements EmployeeQueryTemClockSe
 
     @Override
     public void findClockList(String employeeQcId, PageInfo pageInfo) {
-        temporaryActivityClockDao.employeePage(employeeQcId,pageInfo);
+        TemporaryClockWrapper tcw = JSONObject.parseObject(JSONObject.toJSONString(pageInfo.getQueryParams()), TemporaryClockWrapper.class);
+        temporaryActivityClockDao.employeePage(employeeQcId,pageInfo,tcw);
 
     }
 }

src/main/resources/mapper/TemporaryActivityClockMapper.xml

@@ -35,23 +35,27 @@
                            from temporary_activity_clock)-->
     <select id="employeePageFirsd" resultMap="BaseResultMap">
         select tc.id,
-               tc.temporary_name,
-               tc.create_date,
-               tc.store_name,
-               tc.clock_in_time,
-               tc.noon_clock_out_time,
-               tc.noon_clock_in_time,
-               tc.clock_out_time,
-               tc.clock_province,
-               tc.clock_city,
-               tc.create_date,
-               ti.dept_qc_org_name,
-               ti.charger_name
+        tc.temporary_name,
+        tc.create_date,
+        tc.store_name,
+        tc.clock_in_time,
+        tc.noon_clock_out_time,
+        tc.noon_clock_in_time,
+        tc.clock_out_time,
+        tc.clock_province,
+        tc.clock_city,
+        tc.create_date,
+        ti.dept_qc_org_name,
+        ti.charger_name
         from temporary_info ti
-                 inner join temporary_activity_clock tc on ti.id = tc.temporary_id
-
+        inner join temporary_activity_clock tc on ti.id = tc.temporary_id
+        <where>
+            <if test="tcw != null and tcw.clockOutTimeIsNull != null and tcw.clockOutTimeIsNull == true">
+                tc.clock_out_time is null
+            </if>
+        </where>
         order by id desc
-            limit #{skipNum}, #{pageSize};
+        limit #{skipNum}, #{pageSize};
     </select>
 
     <select id="employeePage" resultMap="BaseResultMap">