|
@@ -82,6 +82,11 @@ namespace wispro.sp.winClient
|
|
caseInfo.FinalVersionDate = string.IsNullOrEmpty(retFiles.FinalizationDate) ? null : DateTime.Parse(retFiles.FinalizationDate);
|
|
caseInfo.FinalVersionDate = string.IsNullOrEmpty(retFiles.FinalizationDate) ? null : DateTime.Parse(retFiles.FinalizationDate);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (keyValuePairs.ContainsKey("FinishedDate"))
|
|
|
|
+ {
|
|
|
|
+ caseInfo.CreateTime = string.IsNullOrEmpty(retFiles.FinishedDate) ? null : DateTime.Parse(retFiles.FinishedDate);
|
|
|
|
+ }
|
|
|
|
+
|
|
if (keyValuePairs.ContainsKey("DoPersons"))
|
|
if (keyValuePairs.ContainsKey("DoPersons"))
|
|
{
|
|
{
|
|
caseInfo.Handlers = retFiles.DoPersons;
|
|
caseInfo.Handlers = retFiles.DoPersons;
|
|
@@ -116,6 +121,8 @@ namespace wispro.sp.winClient
|
|
finalFile = retFiles.finallyFile;
|
|
finalFile = retFiles.finallyFile;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
return caseInfo;
|
|
return caseInfo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -184,33 +191,33 @@ namespace wispro.sp.winClient
|
|
if (i > 1 && returnFile != null)
|
|
if (i > 1 && returnFile != null)
|
|
{
|
|
{
|
|
#region 将文件复制到保存文件夹中
|
|
#region 将文件复制到保存文件夹中
|
|
- string strSavePath = "d:\\CaseFiles";
|
|
|
|
|
|
+ //string strSavePath = "d:\\CaseFiles";
|
|
|
|
|
|
- string strCaseFilePath = Path.Combine(strSavePath, caseInfo.CaseNo);
|
|
|
|
- if (!Directory.Exists(strCaseFilePath))
|
|
|
|
- {
|
|
|
|
- Directory.CreateDirectory(strCaseFilePath);
|
|
|
|
- }
|
|
|
|
- if (!string.IsNullOrEmpty(draftFile))
|
|
|
|
- {
|
|
|
|
- FileInfo file = new FileInfo(draftFile);
|
|
|
|
|
|
+ //string strCaseFilePath = Path.Combine(strSavePath, caseInfo.CaseNo);
|
|
|
|
+ //if (!Directory.Exists(strCaseFilePath))
|
|
|
|
+ //{
|
|
|
|
+ // Directory.CreateDirectory(strCaseFilePath);
|
|
|
|
+ //}
|
|
|
|
+ //if (!string.IsNullOrEmpty(draftFile))
|
|
|
|
+ //{
|
|
|
|
+ // FileInfo file = new FileInfo(draftFile);
|
|
|
|
|
|
- File.Copy(draftFile, Path.Combine(strCaseFilePath, $"草稿-{file.Name}"), true);
|
|
|
|
- }
|
|
|
|
|
|
+ // File.Copy(draftFile, Path.Combine(strCaseFilePath, $"草稿-{file.Name}"), true);
|
|
|
|
+ //}
|
|
|
|
|
|
- if (!string.IsNullOrEmpty(returnFile))
|
|
|
|
- {
|
|
|
|
- FileInfo file = new FileInfo(returnFile);
|
|
|
|
|
|
+ //if (!string.IsNullOrEmpty(returnFile))
|
|
|
|
+ //{
|
|
|
|
+ // FileInfo file = new FileInfo(returnFile);
|
|
|
|
|
|
- File.Copy(returnFile, Path.Combine(strCaseFilePath, $"返稿-{file.Name}"), true);
|
|
|
|
- }
|
|
|
|
|
|
+ // File.Copy(returnFile, Path.Combine(strCaseFilePath, $"返稿-{file.Name}"), true);
|
|
|
|
+ //}
|
|
|
|
|
|
- if (!string.IsNullOrEmpty(finalFile))
|
|
|
|
- {
|
|
|
|
- FileInfo file = new FileInfo(finalFile);
|
|
|
|
|
|
+ //if (!string.IsNullOrEmpty(finalFile))
|
|
|
|
+ //{
|
|
|
|
+ // FileInfo file = new FileInfo(finalFile);
|
|
|
|
|
|
- File.Copy(finalFile, Path.Combine(strCaseFilePath, $"定稿-{file.Name}"), true);
|
|
|
|
- }
|
|
|
|
|
|
+ // File.Copy(finalFile, Path.Combine(strCaseFilePath, $"定稿-{file.Name}"), true);
|
|
|
|
+ //}
|
|
#endregion
|
|
#endregion
|
|
CompareFiles(draftFile, returnFile, finalFile, caseInfo);
|
|
CompareFiles(draftFile, returnFile, finalFile, caseInfo);
|
|
|
|
|
|
@@ -380,7 +387,7 @@ namespace wispro.sp.winClient
|
|
{
|
|
{
|
|
if (MessageBox.Show("获取前一天所有的完成案件,并比较文档?", "提示框", MessageBoxButtons.YesNo) == DialogResult.Yes)
|
|
if (MessageBox.Show("获取前一天所有的完成案件,并比较文档?", "提示框", MessageBoxButtons.YesNo) == DialogResult.Yes)
|
|
{
|
|
{
|
|
- compareCaseFile(DateTime.Parse("2024-12-01"),DateTime.Parse("2024-12-31"));
|
|
|
|
|
|
+ compareCaseFile(DateTime.Parse("2024-02-01"),DateTime.Parse("2024-12-31"));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
@@ -403,33 +410,33 @@ namespace wispro.sp.winClient
|
|
(string.IsNullOrEmpty(finalFile) ? 0 : 1);
|
|
(string.IsNullOrEmpty(finalFile) ? 0 : 1);
|
|
|
|
|
|
#region 将文件复制到保存文件夹中
|
|
#region 将文件复制到保存文件夹中
|
|
- string strSavePath = "d:\\CaseFiles";
|
|
|
|
|
|
+ //string strSavePath = "d:\\CaseFiles";
|
|
|
|
|
|
- string strCaseFilePath = Path.Combine(strSavePath, caseInfo.CaseNo);
|
|
|
|
- if (!Directory.Exists(strCaseFilePath))
|
|
|
|
- {
|
|
|
|
- Directory.CreateDirectory(strCaseFilePath);
|
|
|
|
- }
|
|
|
|
- if (!string.IsNullOrEmpty(draftFile))
|
|
|
|
- {
|
|
|
|
- FileInfo file = new FileInfo(draftFile);
|
|
|
|
|
|
+ //string strCaseFilePath = Path.Combine(strSavePath, caseInfo.CaseNo);
|
|
|
|
+ //if (!Directory.Exists(strCaseFilePath))
|
|
|
|
+ //{
|
|
|
|
+ // Directory.CreateDirectory(strCaseFilePath);
|
|
|
|
+ //}
|
|
|
|
+ //if (!string.IsNullOrEmpty(draftFile))
|
|
|
|
+ //{
|
|
|
|
+ // FileInfo file = new FileInfo(draftFile);
|
|
|
|
|
|
- File.Copy(draftFile, Path.Combine(strCaseFilePath, $"草稿-{file.Name}"), true);
|
|
|
|
- }
|
|
|
|
|
|
+ // File.Copy(draftFile, Path.Combine(strCaseFilePath, $"草稿-{file.Name}"), true);
|
|
|
|
+ //}
|
|
|
|
|
|
- if (!string.IsNullOrEmpty(returnFile))
|
|
|
|
- {
|
|
|
|
- FileInfo file = new FileInfo(returnFile);
|
|
|
|
|
|
+ //if (!string.IsNullOrEmpty(returnFile))
|
|
|
|
+ //{
|
|
|
|
+ // FileInfo file = new FileInfo(returnFile);
|
|
|
|
|
|
- File.Copy(returnFile, Path.Combine(strCaseFilePath, $"返稿-{file.Name}"), true);
|
|
|
|
- }
|
|
|
|
|
|
+ // File.Copy(returnFile, Path.Combine(strCaseFilePath, $"返稿-{file.Name}"), true);
|
|
|
|
+ //}
|
|
|
|
|
|
- if (!string.IsNullOrEmpty(finalFile))
|
|
|
|
- {
|
|
|
|
- FileInfo file = new FileInfo(finalFile);
|
|
|
|
|
|
+ //if (!string.IsNullOrEmpty(finalFile))
|
|
|
|
+ //{
|
|
|
|
+ // FileInfo file = new FileInfo(finalFile);
|
|
|
|
|
|
- File.Copy(finalFile, Path.Combine(strCaseFilePath, $"定稿-{file.Name}"), true);
|
|
|
|
- }
|
|
|
|
|
|
+ // File.Copy(finalFile, Path.Combine(strCaseFilePath, $"定稿-{file.Name}"), true);
|
|
|
|
+ //}
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
if (i > 1)
|
|
if (i > 1)
|