当前角色问题解决

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaAttendanceVo.java

@@ -85,4 +85,9 @@ public class SysOaAttendanceVo extends SysOaAttendance {
 
     private Double overTime;
 
+    // 请假天数
+    private Long absenceDays;
+
+    private Long tripDays;
+
 }

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

@@ -120,6 +120,11 @@ public class OaProgressServiceImpl implements IOaProgressService {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        for (Long id : ids) {
+            QueryWrapper<OaProgress> oaProgressQueryWrapper = new QueryWrapper<>();
+            oaProgressQueryWrapper.eq("parent_id", id);
+            baseMapper.delete(oaProgressQueryWrapper);
+        }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 

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

@@ -115,7 +115,7 @@ public class SysOaRemindServiceImpl implements ISysOaRemindService {
         oaProgressBo.setType(1L);
         List<OaProgressVo> rows1 = progressService.queryPageList(oaProgressBo, pageQuery).getRows();
         for (OaProgressVo row : rows1) {
-            if (row.getRemainTime()!=null && row.getRemainTime()<3L){
+            if (row.getRemainTime()!=null && row.getStatus() !=1L && row.getRemainTime()<3L){
                 SysOaRemindVo sysOaRemindVo = new SysOaRemindVo();
                 sysOaRemindVo.setType("progress-project");
                 sysOaRemindVo.setContent(row.getProgressName());