|
@@ -755,7 +755,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
|
|
LambdaQueryWrapper<PmWorkContent> workTimeQuery = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<PmWorkContent> workTimeQuery = Wrappers.lambdaQuery();
|
|
workTimeQuery.select(PmWorkContent::getSubmitterId, PmWorkContent::getReportId, PmWorkContent::getProjectId, PmWorkContent::getProjectName,
|
|
workTimeQuery.select(PmWorkContent::getSubmitterId, PmWorkContent::getReportId, PmWorkContent::getProjectId, PmWorkContent::getProjectName,
|
|
PmWorkContent::getWorkTime, PmWorkContent::getDeptId, PmWorkContent::getTenantId)
|
|
PmWorkContent::getWorkTime, PmWorkContent::getDeptId, PmWorkContent::getTenantId)
|
|
- .eq(PmWorkContent::getTenantId, tenantId).eq(PmWorkContent::getDeptId, deptId);
|
|
|
|
|
|
+ .eq(PmWorkContent::getTenantId, tenantId);
|
|
if (!users.isEmpty()) {
|
|
if (!users.isEmpty()) {
|
|
workTimeQuery.in(PmWorkContent::getSubmitterId, users);
|
|
workTimeQuery.in(PmWorkContent::getSubmitterId, users);
|
|
}
|
|
}
|
|
@@ -1168,7 +1168,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
|
|
for (PmProject project : pmProjects) {
|
|
for (PmProject project : pmProjects) {
|
|
Integer projectId2 = project.getId();
|
|
Integer projectId2 = project.getId();
|
|
String projectName = project.getProjectName();
|
|
String projectName = project.getProjectName();
|
|
- if (projectId2 == projectId1) {
|
|
|
|
|
|
+ if (projectId2.equals(projectId1)) {
|
|
workHoursStatisticsVO.setProjectName(projectName);
|
|
workHoursStatisticsVO.setProjectName(projectName);
|
|
}
|
|
}
|
|
}
|
|
}
|