From 985fc1244f634c4c4cbaa64c8a8d7495a21998d2 Mon Sep 17 00:00:00 2001 From: MinaR Date: Mon, 17 Mar 2025 17:06:57 +0100 Subject: [PATCH] =?UTF-8?q?non=20sovrascrvre=20le=20attivit=C3=A0=20se=20l?= =?UTF-8?q?'inserimetno=20delle=20ore=20prevede=20una=20descrizione?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../it/integry/ems/activity/service/ActivityService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java index c3fee9ce9b..262409a1df 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java @@ -458,13 +458,18 @@ public class ActivityService { public ActivityTaskDTO insSubactivity(StbActivity stbActivity) throws Exception { try { + String whereCond = ""; + if (!UtilityString.isNullOrEmpty(stbActivity.getActivityDescription())){ + whereCond = " AND stb_activity.activity_description = " + UtilityDB.valueToString(stbActivity.getActivityDescription()); + } String sql = Query.format( "SELECT activity_id " + " FROM stb_activity " + " WHERE stb_activity.parent_activity_id = %s AND " + "stb_activity.user_name = %s AND " + - "( stb_activity.estimated_time = %s OR (stb_activity.effective_date is null AND stb_activity.activity_result_id = 'DA FARE'))", + "( stb_activity.estimated_time = %s OR (stb_activity.effective_date is null AND stb_activity.activity_result_id = 'DA FARE'))\n"+ + whereCond, stbActivity.getParentActivityId(), stbActivity.getUserName(), stbActivity.getEstimatedTime());