Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good

This commit is contained in:
2025-03-17 17:07:09 +01:00

View File

@@ -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());