人事考勤数据分析取消del=0限制

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java

@@ -208,7 +208,7 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
         Date lastDay = getLastDay(time);
         List<LaborCostData> costDataList = new ArrayList<>();
         for (Long userId : userIds) {
-            SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserById(userId), SysUserVo.class);
+            SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserByIdIncludingDel(userId), SysUserVo.class);
             SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo();
             sysOaAttendanceVo.setUserId(sysUser.getUserId());
 

ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml

@@ -164,14 +164,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sop.finish_time, sop.delivery, sop.guarantee, sop.introduction, sop.project_grade, sop.project_status, sop.contract_id, sop.invoice_name,
         sop.invoice_number, sop.invoice_address, sop.invoice_bank, sop.accessory, sop.bail,sop.is_postpone, sop.postpone_reason,sop.postpone_time
         FROM sys_user su
-        left join sys_oa_attendance soa on (su.user_id = soa.user_id  and soa.del_flag='0'  AND (soa.create_time BETWEEN #{firstDay} AND #{lastDay}))
+        left join sys_oa_attendance soa on (su.user_id = soa.user_id  and    (soa.create_time BETWEEN #{firstDay} AND #{lastDay}))
         left join sys_oa_project sop on soa.project_id = sop.project_id
         WHERE su.user_id IN
         <foreach item="userId" index="index" collection="userIds"
                  open="(" separator="," close=")">
             #{userId}
         </foreach>
-        and su.del_flag = '0'
+
     </select>
 
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -98,6 +98,13 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      * @param userId
      * @return
      */
+    /**
+     * 查询所有用户包括被删除的
+     *
+     * @return 用户信息集合信息
+     */
+    SysUser selectUserByIdIncludingDel(Long userId);
+
     SysUser selectUserByIdAndNotDelFlag(Long userId);
 
     /**
@@ -106,4 +113,5 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      */
     List<SysUser> selectListAndNotDel();
 
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -233,4 +233,5 @@ public interface ISysUserService {
      */
     List<SysUser> selectUserList2();
 
+    SysUser selectUserByIdIncludingDel(Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -171,6 +171,17 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectUserById(userId);
     }
 
+    /**
+     * 查询所有用户包括被删除的
+     *
+     * @return 用户信息集合信息
+     */
+    @Override
+    public SysUser selectUserByIdIncludingDel(Long userId) {
+        return baseMapper.selectUserByIdIncludingDel(userId);
+    }
+
+
     @Override
     public SysUser selectUserByIdAndNotDelFlag(Long userId) {
         return baseMapper.selectUserByIdAndNotDelFlag(userId);
@@ -494,6 +505,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectListAndNotDel();
     }
 
+
+
+
+
+
     @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
     @Override
     public String selectUserNameById(Long userId) {

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -169,4 +169,10 @@
     </select>
 
 
+    <select id="selectUserByIdIncludingDel" resultType="com.ruoyi.common.core.domain.entity.SysUser">
+        <include refid="selectUserVo"/>
+        where u.user_id = #{userId}
+    </select>
+
+
 </mapper>