DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增签到月份检索，加班时间折算，项目数据月份检索，

Browse Source
This commit is contained in:
hdka
2025-03-15 16:35:15 +08:00
parent b4b227395c
commit c0fe9c8885
10 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java
View File

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
@@ -55,7 +56,7 @@ public interface ISysOaProjectService {
* 获取每个项目当月的人力资源成本（人天）
* @return
*/
List<SysOaProjectVo> getProjectDataByMonth();
List<SysOaProjectVo> getProjectDataByMonth(Date date);
/**

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

@@ -217,8 +217,8 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
List<SysOaProjectVo> projectVos = new ArrayList<>();
Double workTimes = 0.0;
Double hourWorkTimes = 0.0;
Double overTime = 0.0;
for (SysOaAttendanceVo oaAttendanceVo : sysOaAttendanceVos) {
// 出差问题解决
if (oaAttendanceVo.getProjectId() != 0 && oaAttendanceVo.getProjectId() != 1) {
SysOaProjectVo sysOaProjectVo = projectService.queryById(oaAttendanceVo.getProjectId());
@@ -228,8 +228,10 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
projectVos.add(sysOaProjectVo);
workTimes += oaAttendanceVo.getWorkTimes();
hourWorkTimes += oaAttendanceVo.getHourWorkTimes();
overTime+=oaAttendanceVo.getOverTime();
}
}
// 此为所有小时计的综合
projectVos.stream().distinct().collect(Collectors.toList());
LaborCostData laborCostData = new LaborCostData();
laborCostData.setProjects(projectVos);
@@ -237,6 +239,8 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
laborCostData.setSysUser(sysUser);
laborCostData.setWorkTimes(workTimes);
laborCostData.setHourWorkTime(hourWorkTimes);
// 加班时间
laborCostData.setOvertime(overTime);
costDataList.add(laborCostData);
}

11
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java
View File

@@ -133,11 +133,12 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
* @return
*/
@Override
public List<SysOaProjectVo> getProjectDataByMonth() {
Date date = new Date();
List<SysOaProjectVo> projectVos = baseMapper.getProjectDataByMonth(getFirstDay(date),getLastDay(date));
return projectVos;
public List<SysOaProjectVo> getProjectDataByMonth(Date date) {
System.out.println(date);
if (date==null){
date = new Date();
}
return baseMapper.getProjectDataByMonth(getFirstDay(date),getLastDay(date));
}
/**