diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs index c212c79..fd9eec9 100644 --- a/Ewide.NbzsZheliban/Service/DataService.cs +++ b/Ewide.NbzsZheliban/Service/DataService.cs @@ -170,6 +170,12 @@ namespace Ewide.NbzsZheliban.Service return await db.Ado.SqlQueryAsync("select d.id,isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId,e.id dcbId,d.SignTime,1 type from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.IsInRecords = 1 and d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId,e.id dcbId,d.SignTime,2 type from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.IsInRecords = 1 and d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); "); } } + /// + /// + /// + /// + /// + /// private async Task GetInfoByCardNoAsync(string cardno, string username) { var cachedata = _cache.Get("IndexData-" + cardno); @@ -205,7 +211,7 @@ namespace Ewide.NbzsZheliban.Service { ID = b.ID, Contents = b.Contents, - PublicTime = b.PublicTime.HasValue ? b.PublicTime.Value.ToString("yyyy-MM-dd") : string.Empty, + PublicTime = b.PublicTime.ToString(), Title = b.Title, Area = b.Area }).ToList(); @@ -217,11 +223,15 @@ namespace Ewide.NbzsZheliban.Service { ID = b.ID, Contents = b.Contents, - PublicTime = b.PublicTime.HasValue ? b.PublicTime.Value.ToString("yyyy-MM-dd") : string.Empty, + PublicTime = b.PublicTime.ToString(), Title = b.Title, Area = b.Area }).ToList(); } + list_PoliciesRegulations.ForEach(a => + { + a.PublicTime = Convert.ToDateTime(a.PublicTime).ToString("yyyy-MM-dd"); + }); //移除没有协议也没有分户评估的项目 (空项目) list_projects.FindAll(a => (a.BcxyList == null || a.BcxyList.Count == 0) && (a.FhpgList == null || a.FhpgList.Count == 0)).ForEach(a => { @@ -403,6 +413,12 @@ namespace Ewide.NbzsZheliban.Service var ticket = args.GetJsonValue("ticket", isThrowExp: true); var id = args.GetJsonGuidValue("id", isThrowExp: true); JObject userInfoObj = GetInfoByTicket(ticket); + //var cachedata=_cache.Get($"CacheData-ResidentialAgreement"); + //if (!string.IsNullOrWhiteSpace(cachedata)) + //{ + // var listBcxy = JSON.Deserialize>(cachedata); + // XyFile= listBcxy.Where(p => p.Id == id.ToString()).Select(p => new {ID= p.Id, XyFile=p.XyFile }).First(); + //} var XyFile = ""; //住宅 var entity_zz = db.Queryable().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First(); @@ -430,7 +446,7 @@ namespace Ewide.NbzsZheliban.Service var filePath = GetCurrentRootPath() + XyFile; var pdfFile = new FileInfo(filePath); - if (File.Exists(pdfFile.Directory + "\\lock")) + if (File.Exists(pdfFile.Directory + "\\" + pdfFile.Name + ".lock")) { var picCount = pdfFile.Directory.GetFiles(pdfFile.Name + "-*.jpg").Length; for (int i = 0; i < picCount; i++) @@ -458,13 +474,13 @@ namespace Ewide.NbzsZheliban.Service pics.Add(current_domain + XyFile + "-" + i + ".jpg"); if (i == 0) { - File.WriteAllText(pdfFile.Directory.FullName + "\\lock", "lock"); + File.WriteAllText(pdfFile.Directory.FullName + "\\" + pdfFile.Name + ".lock", pdfFile.Name + ".lock"); } } } catch (Exception ex) { - //throw Oops.Oh(ex.Message); + throw Oops.Oh(ex.Message + ex.StackTrace); throw Oops.Oh(-2002, "无附件文件[" + nbzs_domain + XyFile + "]"); } } diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll index 9e3c886..44c4f80 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb index 2801620..d2ebca3 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll index 5d9282e..d79c73b 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll index 79d51f3..6940a75 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb index 7f83935..0ed138d 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll index 5c2f21d..99d4a0e 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache index 0bc3a86..c37438c 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll index 9e3c886..44c4f80 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb index 2801620..d2ebca3 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll index 5d9282e..d79c73b 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache index dd972eb..3301bfa 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll index 79d51f3..6940a75 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb index 7f83935..0ed138d 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb differ diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll index 5c2f21d..99d4a0e 100644 Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ diff --git a/FrontCode2/sunshine_levy/index.html b/FrontCode2/sunshine_levy/index.html index 57eeec0..b659b92 100644 --- a/FrontCode2/sunshine_levy/index.html +++ b/FrontCode2/sunshine_levy/index.html @@ -3,8 +3,28 @@ - + 宁波房屋征收 + @@ -15,7 +35,7 @@
\ No newline at end of file diff --git a/framework/Api/Ewide.Web.Entry/appsettings.json b/framework/Api/Ewide.Web.Entry/appsettings.json index 248ee94..7345411 100644 --- a/framework/Api/Ewide.Web.Entry/appsettings.json +++ b/framework/Api/Ewide.Web.Entry/appsettings.json @@ -35,7 +35,8 @@ "AllowedHosts": "*", "nbzs_file_path": "D:\\1_发布程序", "nbzs_domain-bak": "https://zsxt.nbzs.org.cn", - "nbzs_domain": "http://118.178.224.202:2258/", + "nbzs_domain_118": "http://118.178.224.202:2258/", + "nbzs_domain": "http://10.19.94.9:8020/", "current_domain": "http://localhost:5566/", "CorsAccessorSettings": { "PolicyName": "自定义跨域策略名", diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf new file mode 100644 index 0000000..0eabf47 Binary files /dev/null and b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf differ diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-0.jpg b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-0.jpg new file mode 100644 index 0000000..7a63e8e Binary files /dev/null and b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-0.jpg differ diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-1.jpg b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-1.jpg new file mode 100644 index 0000000..1655806 Binary files /dev/null and b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/b02f32b4-fa82-44c2-b407-614612c65534.pdf-1.jpg differ diff --git a/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/lock b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/lock new file mode 100644 index 0000000..19104f1 --- /dev/null +++ b/framework/Api/Ewide.Web.Entry/wwwroot/Files/UploadFiles/e85a13ef-431c-46a5-85cd-9dd1b4f50fc6/Resident/lock @@ -0,0 +1 @@ +lock \ No newline at end of file