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

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source 
# Conflicts:
#	ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250307174630.java
This commit is contained in:
Fabio Narracci
2025-03-10 16:38:55 +01:00
parent 78c5b87e20 85afb0ce8a
commit dd6d91f436
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomer.java
View File

@@ -86,6 +86,7 @@ public enum IntegryCustomer {
MFI(IntegryCustomerDB.MFI_FashionGroup),
Midel(IntegryCustomerDB.Midel_Midel),
Morgante(IntegryCustomerDB.Morgante_Morgante),
Querceta(IntegryCustomerDB.Querceta_MasserieAmiche),
ResinaColor(IntegryCustomerDB.ResinaColor_ResinaColor),
RistoCash(IntegryCustomerDB.RistoCash_RistoCash),
RossoGargano(IntegryCustomerDB.RossoGargano_RossoGargano, IntegryCustomerDB.RossoGargano_RossoGarganoCont),

3
ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomerDB.java
View File

@@ -134,6 +134,9 @@ public enum IntegryCustomerDB {
Morgante_Morgante("morgante"),
Querceta_MasserieAmiche("masserieamiche"),
ResinaColor_ResinaColor("resinacolor"),

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

@@ -1010,9 +1010,7 @@ 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" +
" 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" +
" activity_description, " +
" CAST(MAX(IIF(\n" +
" ISNULL(effective_date, estimated_date) BETWEEN dbo.f_getfirstdayofweek(GETDATE()) AND dbo.f_getlastdayofweek(GETDATE()),\n" +
" 1,\n" +
@@ -1046,7 +1044,8 @@ 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";
" stb_user.full_name,\n" +
" activity_description";
List<ActivityDTO.WorkedHours> activityResponseDtoWorkedHours = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, ActivityDTO.WorkedHours.class);