update 20241125

This commit is contained in:
Stefan Hutter
2024-11-24 19:38:37 +01:00
parent 6bdbc4173e
commit 341ea50f06
281 changed files with 14362 additions and 180 deletions

View File

@@ -15,6 +15,7 @@ using Logging;
using System.Configuration;
using System.Runtime.CompilerServices;
using NLog.LayoutRenderers;
using Helper;
@@ -265,7 +266,7 @@ namespace Database
}
}
public DataTable Get_Vorlage_By_DokumentID(string dokumentid)
public DataTable Get_Vorlage_By_DokumentID(string dokumentid, bool useoffice = false, string tempdir="")
{
string sql = "Select dbo.BinaryToBase64(vorlage) as Data, dbo.office_vorlage.office_vorlagenr as nr from dbo.Office_Vorlage_Datei INNER JOIN ";
sql = sql + " dbo.office_vorlage ON dbo.Office_Vorlage_Datei.office_vorlage_dateinr = dbo.office_vorlage.office_vorlagenr INNER JOIN ";
@@ -273,7 +274,20 @@ namespace Database
sql = sql + "dbo.dokument ON dbo.dokumenttyp.dokumenttypnr = dbo.dokument.dokumenttypnr ON dbo.office_vorlage.office_vorlagenr = dbo.dokumenttyp.office_vorlagenr ";
sql = sql + "WHERE dbo.dokument.dokumentid = '" + dokumentid + "' ";
Get_Tabledata(sql, false, true);
return dsdaten.Tables[0];
if (!useoffice) { return dsdaten.Tables[0]; }
else
{
VBFileManagement.VBFileManagement vm = new VBFileManagement.VBFileManagement();
vm.Get_From_DB(Convert.ToInt32(dsdaten.Tables[0].Rows[0][1]), tempdir + dokumentid, connectionstring, false);
clsFileHelper fh = new clsFileHelper();
dsdaten.Tables[0].Rows[0][0] = fh.Base64FromFile(tempdir+ dokumentid);
fh = null;
vm=null;
System.IO.File.Delete(tempdir + dokumentid);
return dsdaten.Tables[0];
}
}