Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Ripristinata logica sotto attività

Browse Source
This commit is contained in:
Marco Elefante
2025-03-11 09:41:48 +01:00
parent 7856856edd
commit 91af9ec6ee
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
View File

@@ -1010,7 +1010,9 @@ public class ActivityService {
" stb_user.full_name,\n" +
" MAX(IIF(effective_date <= CAST(GETDATE() AS DATE), effective_date, NULL)) AS last_activity_date,\n" +
" MIN(IIF(estimated_date >= CAST(GETDATE() AS DATE), estimated_date, NULL)) AS next_activity_date,\n" +
" activity_description, " +
" MAX(IIF(((estimated_date BETWEEN dbo.f_getfirstdayofweek(GETDATE()) AND dbo.f_getlastdayofweek(GETDATE()) OR\n" +
" estimated_date IS NULL) AND effective_date IS NULL), stb_activity.activity_description,\n" +
" NULL)) AS activity_description,\n" +
" CAST(MAX(IIF(\n" +
" ISNULL(effective_date, estimated_date) BETWEEN dbo.f_getfirstdayofweek(GETDATE()) AND dbo.f_getlastdayofweek(GETDATE()),\n" +
" 1,\n" +
@@ -1044,8 +1046,7 @@ public class ActivityService {
" AND stb_activity.parent_activity_id IN (" + UtilityDB.listValueToString(elencoId) + ")\n" +
"GROUP BY stb_activity.parent_activity_id,\n" +
" stb_activity.user_name,\n" +
" stb_user.full_name,\n" +
" activity_description";
" stb_user.full_name";
List<ActivityDTO.WorkedHours> activityResponseDtoWorkedHours = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityDTO.WorkedHours.class);