add 后台服务 和 部署sql 等

This commit is contained in:
路 范
2021-09-28 10:52:59 +08:00
parent 6c21c8b36e
commit 9b8a0f6d82
57 changed files with 9264 additions and 488 deletions

View File

@@ -1,6 +1,5 @@
using Ewide.NbzsZheliban.Entity;
using Ewide.NbzsZheliban.Entity.Base;
using Ewide.NbzsZheliban.Entity.Extends;
using Ewide.Nbzs.Entity;
using Ewide.Nbzs.Entity.Extends;
using Ewide.NbzsZheliban.Tools;
using Furion;
using Furion.DataEncryption;
@@ -44,7 +43,7 @@ namespace Ewide.NbzsZheliban.Service
{
var ticket = args.GetJsonValue("ticket", isThrowExp: true);
var userinfoObj = GetInfoByTicket(ticket);
return new ZhelibanUserInfo
return new Nbzs.Entity.Extends.ZhelibanUserInfo
{
CardId = userinfoObj["idnum"].ToString(),
Name = userinfoObj["username"].ToString()
@@ -65,7 +64,7 @@ namespace Ewide.NbzsZheliban.Service
var cardno = userinfoObj["idnum"].ToString();
var username = userinfoObj["username"].ToString();
//修改测试数据
db.Ado.ExecuteCommand("update InvestigateTable set ExpropriatedCardNo='" + cardno + "' where id ='FF010DD7-C938-46AC-85DD-FAF9DC128BFD' ");
db.Ado.ExecuteCommand("update InvestigateTable set ExpropriatedCardNo='" + cardno + "' where id ='A80C1599-B658-4176-8CCF-DDA57A64254F' ");
return await GetInfoByCardNoAsync(cardno, username);
}
/// <summary>
@@ -153,7 +152,7 @@ namespace Ewide.NbzsZheliban.Service
listAreas.Add(Guid.Parse(p.AreaID));
});
//政策
var list_PoliciesRegulations = await db.Queryable<Entity.PoliciesRegulations>().Where(a => listAreas.Contains(a.AreaID)).Select(b => new PoliciesRegulation
var list_PoliciesRegulations = await db.Queryable<Nbzs.Entity.PoliciesRegulations>().Where(a => listAreas.Contains(a.AreaID)).Select(b => new PoliciesRegulation
{
ID = b.ID,
Contents = b.Contents,
@@ -162,12 +161,12 @@ namespace Ewide.NbzsZheliban.Service
Area = b.Area
}).ToListAsync();
H5IndexModel h5IndexModel = new()
Nbzs.Entity.Extends.H5IndexModel h5IndexModel = new()
{
PrjList = list_projects,
IdCard = cardno,
UserName = username,
PoliciesRegulationsLists = new Entity.Extends.PoliciesRegulations { List = list_PoliciesRegulations, TotalCount = list_PoliciesRegulations.Count }
PoliciesRegulationsLists = new Nbzs.Entity.Extends.PoliciesRegulations { List = list_PoliciesRegulations, TotalCount = list_PoliciesRegulations.Count }
};
return h5IndexModel;
}
@@ -254,7 +253,7 @@ namespace Ewide.NbzsZheliban.Service
var ticket = args.GetJsonValue("ticket", isThrowExp: true);
var id = args.GetJsonGuidValue("id", isThrowExp: true);
JObject userInfoObj = GetInfoByTicket(ticket);
var entity = await db.Queryable<Entity.PoliciesRegulations>().Where(p => p.ID == id).Select(p => new PoliciesRegulation
var entity = await db.Queryable<Nbzs.Entity.PoliciesRegulations>().Where(p => p.ID == id).Select(p => new PoliciesRegulation
{
ID = p.ID,
Area = p.Area,
@@ -279,7 +278,7 @@ namespace Ewide.NbzsZheliban.Service
JObject userInfoObj = GetInfoByTicket(ticket);
var XyFile = "";
//住宅
var entity_zz = db.Queryable<Entity.ResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
var entity_zz = db.Queryable<Nbzs.Entity.ResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
if (entity_zz != null)
{
XyFile = entity_zz.XyFile;
@@ -287,7 +286,7 @@ namespace Ewide.NbzsZheliban.Service
//非住宅
else
{
var entity_fzz = db.Queryable<Entity.NonResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
var entity_fzz = db.Queryable<Nbzs.Entity.NonResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
if (entity_fzz != null)
{
XyFile = entity_fzz.XyFile;
@@ -314,7 +313,7 @@ namespace Ewide.NbzsZheliban.Service
JObject userInfoObj = GetInfoByTicket(ticket);
var XyFile = "";
//住宅
var entity_zz = db.Queryable<Entity.ResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
var entity_zz = db.Queryable<Nbzs.Entity.ResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
if (entity_zz != null)
{
XyFile = entity_zz.XyFile;
@@ -322,7 +321,7 @@ namespace Ewide.NbzsZheliban.Service
//非住宅
else
{
var entity_fzz = db.Queryable<Entity.NonResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
var entity_fzz = db.Queryable<Nbzs.Entity.NonResidentialAgreement>().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First();
if (entity_fzz != null)
{
XyFile = entity_fzz.XyFile;
@@ -426,7 +425,7 @@ namespace Ewide.NbzsZheliban.Service
if (jzlrModel.Type == 1)
{
//住宅
var entity_zz = db.Queryable<Entity.InvestigateTable_Assessment>().Where(p => p.ID == Guid.Parse(jzlrModel.Id)).Select(p => new { p.ID, p.AssementFile }).First();
var entity_zz = db.Queryable<InvestigateTable_Assessment>().Where(p => p.ID == Guid.Parse(jzlrModel.Id)).Select(p => new { p.ID, p.AssementFile }).First();
if (entity_zz != null)
{
fileUrl = entity_zz.AssementFile;
@@ -435,7 +434,7 @@ namespace Ewide.NbzsZheliban.Service
else if (jzlrModel.Type == 2)
{
//非住宅
var entity_fzz = db.Queryable<Entity.NonInvestigateTable_Assessment>().Where(p => p.ID == Guid.Parse(jzlrModel.Id)).Select(p => new { p.ID, p.AssementFile }).First();
var entity_fzz = db.Queryable<NonInvestigateTable_Assessment>().Where(p => p.ID == Guid.Parse(jzlrModel.Id)).Select(p => new { p.ID, p.AssementFile }).First();
if (entity_fzz != null)
{
fileUrl = entity_fzz.AssementFile;