chenwei
/
lanlingxian_ziranziyuanheguihua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目图斑添加支持

dev
陈伟 2025-05-25 15:55:33 +08:00
parent f9129ea65f
commit 49238862ab
2 changed files with 56 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp1.cs
View File

@ -2413,7 +2413,7 @@ public partial class DroneCaseInfoSingleApp
/// <param name="startTime"></param> /// <param name="startTime"></param>
/// <param name="endTime"></param> /// <param name="endTime"></param>
/// <returns></returns> /// <returns></returns>
public Response<List<OffenceResp>> CaseOffenceForExcel(DateTime startTime, DateTime endTime,string tubanlaiyuan) public Response<List<OffenceResp>> CaseOffenceForExcel(DateTime startTime, DateTime endTime, string tubanlaiyuan)
{ {
//核实后新增违法耕地 ：占耕地的未归档图斑+占耕地的已归档的非农化类型图斑 //核实后新增违法耕地 ：占耕地的未归档图斑+占耕地的已归档的非农化类型图斑
//整改后剩余违法耕地 ：占耕地的未归档的图斑 //整改后剩余违法耕地 ：占耕地的未归档的图斑
@ -2442,13 +2442,14 @@ public partial class DroneCaseInfoSingleApp
List<SysOrg> org = new List<SysOrg>(); List<SysOrg> org = new List<SysOrg>();
List<DroneCaseInfoSingle> caseList = new List<DroneCaseInfoSingle>(); List<DroneCaseInfoSingle> caseList = new List<DroneCaseInfoSingle>();
var tubanlaiyuanList = string.IsNullOrEmpty(tubanlaiyuan) ? new List<string>() :tubanlaiyuan.Split(",").ToList(); var tubanlaiyuanList =
string.IsNullOrEmpty(tubanlaiyuan) ? new List<string>() : tubanlaiyuan.Split(",").ToList();
if (orgIds.Any(r => r.Level == 0) || user.Id == -1) // 查询全部 if (orgIds.Any(r => r.Level == 0) || user.Id == -1) // 查询全部
{ {
org = client.Queryable<SysOrg>().Where(r => r.Level == 1).ToList(); org = client.Queryable<SysOrg>().Where(r => r.Level == 1).ToList();
caseList = client.Queryable<DroneCaseInfoSingle>() caseList = client.Queryable<DroneCaseInfoSingle>()
.LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id) .LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id)
.WhereIF(!string.IsNullOrEmpty(tubanlaiyuan),(a,b)=> tubanlaiyuanList.Contains(a.tubanlaiyuan)) .WhereIF(!string.IsNullOrEmpty(tubanlaiyuan), (a, b) => tubanlaiyuanList.Contains(a.tubanlaiyuan))
.Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime && .Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime &&
a.typename == "农用地" && a.is_closed == 0) a.typename == "农用地" && a.is_closed == 0)
.Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList(); .Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList();
@ -2460,7 +2461,7 @@ public partial class DroneCaseInfoSingleApp
.Where(r => r.Level == 2 && orgIds.Select(a => a.Id).Contains(r.ParentId)).ToList(); .Where(r => r.Level == 2 && orgIds.Select(a => a.Id).Contains(r.ParentId)).ToList();
caseList = client.Queryable<DroneCaseInfoSingle>() caseList = client.Queryable<DroneCaseInfoSingle>()
.LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id) .LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id)
.WhereIF(!string.IsNullOrEmpty(tubanlaiyuan),(a,b)=> tubanlaiyuanList.Contains(a.tubanlaiyuan)) .WhereIF(!string.IsNullOrEmpty(tubanlaiyuan), (a, b) => tubanlaiyuanList.Contains(a.tubanlaiyuan))
.Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime && .Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime &&
a.typename == "农用地" && a.is_closed == 0) a.typename == "农用地" && a.is_closed == 0)
.Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList(); .Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList();
@ -2540,7 +2541,8 @@ public partial class DroneCaseInfoSingleApp
/// <param name="startTime"></param> /// <param name="startTime"></param>
/// <param name="endTime"></param> /// <param name="endTime"></param>
/// <returns></returns> /// <returns></returns>
public Response<List<OffenceTBResp>> CaseOffencetbForExcel(DateTime startTime, DateTime endTime,string tubanlaiyuan) public Response<List<OffenceTBResp>> CaseOffencetbForExcel(DateTime startTime, DateTime endTime,
string tubanlaiyuan)
{ {
var user = _auth.GetCurrentUser().User; var user = _auth.GetCurrentUser().User;
var orgIds = base._auth.GetCurrentUser().Orgs; var orgIds = base._auth.GetCurrentUser().Orgs;
@ -2557,14 +2559,15 @@ public partial class DroneCaseInfoSingleApp
List<SysOrg> org = new List<SysOrg>(); List<SysOrg> org = new List<SysOrg>();
List<DroneCaseInfoSingle> caseList = new List<DroneCaseInfoSingle>(); List<DroneCaseInfoSingle> caseList = new List<DroneCaseInfoSingle>();
var tubanlaiyuanList = string.IsNullOrEmpty(tubanlaiyuan) ? new List<string>() :tubanlaiyuan.Split(",").ToList(); var tubanlaiyuanList =
string.IsNullOrEmpty(tubanlaiyuan) ? new List<string>() : tubanlaiyuan.Split(",").ToList();
if (orgIds.Any(r => r.Level == 0) || user.Id == -1) // 查询全部 if (orgIds.Any(r => r.Level == 0) || user.Id == -1) // 查询全部
{ {
org = client.Queryable<SysOrg>().Where(r => r.Level == 1).ToList(); org = client.Queryable<SysOrg>().Where(r => r.Level == 1).ToList();
caseList = client.Queryable<DroneCaseInfoSingle>() caseList = client.Queryable<DroneCaseInfoSingle>()
.LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id) .LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id)
.Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime && a.is_closed == 0) .Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime && a.is_closed == 0)
.WhereIF(!string.IsNullOrEmpty(tubanlaiyuan),(a,b)=>tubanlaiyuanList.Contains(a.tubanlaiyuan)) .WhereIF(!string.IsNullOrEmpty(tubanlaiyuan), (a, b) => tubanlaiyuanList.Contains(a.tubanlaiyuan))
.Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList(); .Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList();
} }
else if (orgIds.Any(r => r.Level == 1)) else if (orgIds.Any(r => r.Level == 1))
@ -2574,7 +2577,7 @@ public partial class DroneCaseInfoSingleApp
.Where(r => r.Level == 2 && orgIds.Select(a => a.Id).Contains(r.ParentId)).ToList(); .Where(r => r.Level == 2 && orgIds.Select(a => a.Id).Contains(r.ParentId)).ToList();
caseList = client.Queryable<DroneCaseInfoSingle>() caseList = client.Queryable<DroneCaseInfoSingle>()
.LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id) .LeftJoin<WFProcess>((a, b) => SqlFunc.JsonField(b.InstanceInfo, "pkeyValue") == a.Id)
.WhereIF(!string.IsNullOrEmpty(tubanlaiyuan),(a,b)=>tubanlaiyuanList.Contains(a.tubanlaiyuan)) .WhereIF(!string.IsNullOrEmpty(tubanlaiyuan), (a, b) => tubanlaiyuanList.Contains(a.tubanlaiyuan))
.Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime && a.is_closed == 0) .Where((a, b) => a.synchronoustime >= startTime && a.synchronoustime <= endTime && a.is_closed == 0)
.Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList(); .Where((a, b) => !string.IsNullOrEmpty(b.Id)).ToList();
} }
@ -3697,12 +3700,13 @@ public partial class DroneCaseInfoSingleApp
/// <param name="startTime"></param> /// <param name="startTime"></param>
/// <param name="endTime"></param> /// <param name="endTime"></param>
/// <returns></returns> /// <returns></returns>
public Response<MemoryStream> CaseOfWrjqyxctbzgqktjbToExcel(DateTime startTime, DateTime endTime,string tubanlaiyuan) public Response<MemoryStream> CaseOfWrjqyxctbzgqktjbToExcel(DateTime startTime, DateTime endTime,
string tubanlaiyuan)
{ {
Response<MemoryStream> response = new Response<MemoryStream>(); Response<MemoryStream> response = new Response<MemoryStream>();
try try
{ {
var list = CaseOffenceForExcel(startTime, endTime,tubanlaiyuan).Result; var list = CaseOffenceForExcel(startTime, endTime, tubanlaiyuan).Result;
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
#region 样式设置 #region 样式设置
@ -3944,7 +3948,8 @@ public partial class DroneCaseInfoSingleApp
/// <param name="startTime"></param> /// <param name="startTime"></param>
/// <param name="endTime"></param> /// <param name="endTime"></param>
/// <returns></returns> /// <returns></returns>
public Response<MemoryStream> CaseOfWrjqyxctbxfqktjbToExcel(DateTime startTime, DateTime endTime,string tubanlaiyuan) public Response<MemoryStream> CaseOfWrjqyxctbxfqktjbToExcel(DateTime startTime, DateTime endTime,
string tubanlaiyuan)
{ {
Response<MemoryStream> response = new Response<MemoryStream>(); Response<MemoryStream> response = new Response<MemoryStream>();
try try
@ -4233,8 +4238,9 @@ public partial class DroneCaseInfoSingleApp
if (!string.IsNullOrEmpty(req.tubanlaiyuan)) if (!string.IsNullOrEmpty(req.tubanlaiyuan))
{ {
var tubanlaiyuanList = req.tubanlaiyuan.Split(",").ToList(); var tubanlaiyuanList = req.tubanlaiyuan.Split(",").ToList();
sqlpart += $" and tubanlaiyuan in ('{string.Join("','", tubanlaiyuanList)}')"; sqlpart += $" and tubanlaiyuan in ('{string.Join("','", tubanlaiyuanList)}')";
} }
//var resubmit = client.Queryable<ReSubmit>().Select(r => r.CaseNo).ToList(); //var resubmit = client.Queryable<ReSubmit>().Select(r => r.CaseNo).ToList();
string sql = @$"SELECT a.""Id"", countyname, streetname,communityname,original_case_no,geomid, string sql = @$"SELECT a.""Id"", countyname, streetname,communityname,original_case_no,geomid,
remark,(date_trunc('second', synchronoustime))::text as synchronoustime, remark,(date_trunc('second', synchronoustime))::text as synchronoustime,
@ -4869,6 +4875,34 @@ WHERE is_closed = 0 and b.""Id"" is not null and synchronoustime >= @StartTime a
RefAsync<int> totalcount = 0; RefAsync<int> totalcount = 0;
switch (category) switch (category)
{ {
case "设施农用地":
//查询案件的填报(anjianzhaopian)和整改图片信息(chaichufugenghoupic),补办手续（bubanzhaopian）
var caseImg0 = await client.Queryable<DroneSsnyd>().FirstAsync(r => r.Id == caseid);
if (caseImg0 != null)
{
// 合并
AddImagesToList(caseImg0.wjzp_kg, imageList);
AddImagesToList(caseImg0.njzp_kg, imageList);
AddImagesToList(caseImg0.wjzp_kgzg, imageList);
AddImagesToList(caseImg0.njzp_kgzg, imageList);
AddImagesToList(caseImg0.wjzp_jz, imageList);
AddImagesToList(caseImg0.njzp_jz, imageList);
AddImagesToList(caseImg0.wjzp_jzzg, imageList);
AddImagesToList(caseImg0.njzp_jzzg, imageList);
AddImagesToList(caseImg0.wjzp_wg, imageList);
AddImagesToList(caseImg0.njzp_wg, imageList);
AddImagesToList(caseImg0.wjzp_wgzg, imageList);
AddImagesToList(caseImg0.njzp_wgzg, imageList);
AddImagesToList(caseImg0.wjzp_rc, imageList);
AddImagesToList(caseImg0.njzp_rc, imageList);
AddImagesToList(caseImg0.wjzp_rczg, imageList);
AddImagesToList(caseImg0.njzp_rczg, imageList);
AddImagesToList(caseImg0.wjzp_rcfh, imageList);
AddImagesToList(caseImg0.njzp_rcfh, imageList);
}
break;
case "违法用地": case "违法用地":
//查询案件的填报(anjianzhaopian)和整改图片信息(chaichufugenghoupic),补办手续（bubanzhaopian） //查询案件的填报(anjianzhaopian)和整改图片信息(chaichufugenghoupic),补办手续（bubanzhaopian）
var caseImg1 = await client.Queryable<DroneCaseInfoSingle>().FirstAsync(r => r.Id == caseid); var caseImg1 = await client.Queryable<DroneCaseInfoSingle>().FirstAsync(r => r.Id == caseid);
@ -6163,7 +6197,8 @@ WHERE is_closed = 0 and b.""Id"" is not null and synchronoustime >= @StartTime a
Random random = new Random(); Random random = new Random();
using (var uow = base.UnitWork.CreateContext()) using (var uow = base.UnitWork.CreateContext())
{ {
var data1 = await uow.ReSubmit.AsQueryable().Where(r => r.CaseNo == originalcaseno && r.SubjectKey == subjectkey).ToListAsync(); var data1 = await uow.ReSubmit.AsQueryable()
.Where(r => r.CaseNo == originalcaseno && r.SubjectKey == subjectkey).ToListAsync();
if (data1.Count > 0) if (data1.Count > 0)
{ {
return new Response<bool> { Result = false, Code = 500, Message = "案件已复提,无法审核" }; return new Response<bool> { Result = false, Code = 500, Message = "案件已复提,无法审核" };

10
OpenAuth.Repository/Domain/DroneSsnyd.cs
View File

@ -709,7 +709,13 @@ namespace OpenAuth.Repository.Domain
/// </summary> /// </summary>
public DateTime? yijiaoshijian { get; set; } public DateTime? yijiaoshijian { get; set; }
[SugarColumn(IsIgnore = true)] public string wjzp_rc { get; set; }
public List<DroneSsnydRcjg> RcjgList { get; set; } public string njzp_rc { get; set; }
public string wjzp_rczg { get; set; }
public string njzp_rczg { get; set; }
public string wjzp_rcfh { get; set; }
public string njzp_rcfh { get; set; }
[SugarColumn(IsIgnore = true)] public List<DroneSsnydRcjg> RcjgList { get; set; }
} }
} }