update接口增加政策
This commit is contained in:
路 范
@@ -29,18 +29,8 @@ namespace Ewide.NbzsZheliban.Service
|
||||
db = repository.Context;
|
||||
_jsonSerializer = jsonSerializer;
|
||||
}
|
||||
/// <summary>
|
||||
/// 被征收人关联的项目列表
|
||||
/// </summary>
|
||||
/// <param name="args"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost("/project/list")]
|
||||
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
|
||||
public async Task<dynamic> PrjList([FromBody] JObject args)
|
||||
private JObject GetInfoByTicket(string ticket)
|
||||
{
|
||||
#region 票据
|
||||
var ticket = args.GetJsonValue("ticket", isThrowExp: true);
|
||||
//var ticket = Request.Query["ticket"];
|
||||
if (!string.IsNullOrWhiteSpace(ticket))
|
||||
{
|
||||
var time = DateTime.Now.ToString("yyyyMMddHHmmss");
|
||||
@@ -88,43 +78,72 @@ namespace Ewide.NbzsZheliban.Service
|
||||
}
|
||||
if (userinfoObj["result"].Value<int>() != 0)
|
||||
throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]");
|
||||
var cardno = userinfoObj["idnum"].ToString();
|
||||
var username = userinfoObj["username"].ToString();
|
||||
|
||||
#endregion
|
||||
//var cardno = args.GetJsonValue("cardno", isThrowExp: true);
|
||||
//住宅调查表
|
||||
var list_zz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
|
||||
//非住宅调查表
|
||||
var list_fzz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
|
||||
//调查表集合
|
||||
var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
|
||||
//项目列表
|
||||
var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
|
||||
//分户评估
|
||||
var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
|
||||
var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
|
||||
//补偿协议
|
||||
var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select 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 from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
|
||||
|
||||
list_projects.ForEach(p =>
|
||||
{
|
||||
p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
|
||||
p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
|
||||
});
|
||||
H5IndexModel h5IndexModel = new()
|
||||
{
|
||||
PrjList = list_projects,
|
||||
IdCard = cardno,
|
||||
UserName = username
|
||||
};
|
||||
return h5IndexModel;
|
||||
return userinfoObj;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw Oops.Oh("无效访问");
|
||||
}
|
||||
}
|
||||
private async Task<H5IndexModel> GetInfoByCardNoAsync(string cardno, string username)
|
||||
{
|
||||
//var cardno = args.GetJsonValue("cardno", isThrowExp: true);
|
||||
//住宅调查表
|
||||
var list_zz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
|
||||
//非住宅调查表
|
||||
var list_fzz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
|
||||
//调查表集合
|
||||
var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
|
||||
//项目列表
|
||||
var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.AreaID,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
|
||||
//分户评估
|
||||
var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
|
||||
var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
|
||||
//补偿协议
|
||||
var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select 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 from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
|
||||
//政策
|
||||
var list_PoliciesRegulations = await db.Queryable<PoliciesRegulations>().ToListAsync();
|
||||
var listAreas = new List<Guid?>
|
||||
{
|
||||
Guid.Parse("B2A0291C-84C7-4D86-A6D5-CB9FCCF4A2D8")
|
||||
};
|
||||
list_projects.ForEach(p =>
|
||||
{
|
||||
p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
|
||||
p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
|
||||
listAreas.Add(Guid.Parse(p.AreaID));
|
||||
});
|
||||
H5IndexModel h5IndexModel = new()
|
||||
{
|
||||
PrjList = list_projects,
|
||||
IdCard = cardno,
|
||||
UserName = username,
|
||||
PoliciesRegulationsList = list_PoliciesRegulations.Where(a => listAreas.Contains(a.AreaID)).Select(b => new PoliciesRegulation
|
||||
{
|
||||
ID = b.ID,
|
||||
Contents = b.Contents,
|
||||
PublicTime = b.PublicTime,
|
||||
Title = b.Title
|
||||
}).ToList()
|
||||
};
|
||||
return h5IndexModel;
|
||||
}
|
||||
/// <summary>
|
||||
/// 被征收人关联的项目列表
|
||||
/// </summary>
|
||||
/// <param name="args"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost("/project/list")]
|
||||
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
|
||||
public async Task<dynamic> PrjList([FromBody] JObject args)
|
||||
{
|
||||
var ticket = args.GetJsonValue("ticket", isThrowExp: true);
|
||||
//var ticket = Request.Query["ticket"];
|
||||
var userinfoObj = GetInfoByTicket(ticket);
|
||||
var cardno = userinfoObj["idnum"].ToString();
|
||||
var username = userinfoObj["username"].ToString();
|
||||
return await GetInfoByCardNoAsync(cardno, username);
|
||||
}
|
||||
/// <summary>
|
||||
/// 被征收人关联的项目列表
|
||||
/// </summary>
|
||||
@@ -136,35 +155,7 @@ namespace Ewide.NbzsZheliban.Service
|
||||
{
|
||||
var cardno = "341203199206303411";
|
||||
var username = "张三丰";
|
||||
|
||||
//var cardno = args.GetJsonValue("cardno", isThrowExp: true);
|
||||
//住宅调查表
|
||||
var list_zz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
|
||||
//非住宅调查表
|
||||
var list_fzz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
|
||||
//调查表集合
|
||||
var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
|
||||
//项目列表
|
||||
var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
|
||||
//分户评估
|
||||
var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
|
||||
var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
|
||||
//补偿协议
|
||||
var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select 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 from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
|
||||
|
||||
list_projects.ForEach(p =>
|
||||
{
|
||||
p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
|
||||
p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
|
||||
});
|
||||
H5IndexModel h5IndexModel = new()
|
||||
{
|
||||
PrjList = list_projects,
|
||||
IdCard = cardno,
|
||||
UserName = username
|
||||
};
|
||||
return h5IndexModel;
|
||||
|
||||
return await GetInfoByCardNoAsync(cardno, username);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user