ewide/number_zj
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2025年度投票修改

Browse Source
This commit is contained in:
路 范
2025-06-10 19:19:30 +08:00
parent 88316af778
commit 4d17ef84c2
14 changed files with 1096 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

270
20220330_Vote/Vote.Services/ApiController/Projects2025Service.cs Normal file
View File

@@ -0,0 +1,270 @@
using COSXML.Model.Tag;
using Ewide.Core.Util;
using Furion.DatabaseAccessor;
using Furion.DynamicApiController;
using Furion.FriendlyException;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Vote.Services.Dto;
using Vote.Services.Entities;
using static Vote.Services.Dto.ProjectsList2Output;
namespace Vote.Services.ApiController
{
/// <summary>
/// 项目
/// </summary>
[ApiDescriptionSettings("Vote", Order = 0)]
[Route("/gb/yjb/api/projects2025")]
public class Projects2025Service : IDynamicApiController
{
//private readonly IRepository<Entities.Projects> rep_Projects;
private readonly IRepository<Entities.Projects_2025> rep_Projects2025;
private readonly IRepository<Entities.Experts> rep_Experts;
private readonly IRepository<Entities.VoteRecords> rep_VoteRecords;
private readonly IRepository<Entities.Projects_2021> rep_Projects2021;
private readonly IRepository<Entities.VoteRecords_2021> rep_VoteRecords2021;
private readonly IRepository<Entities.Projects_2022> rep_Projects2022;
private readonly IRepository<Entities.VoteRecords_2022> rep_VoteRecords2022;
public Projects2025Service(
IRepository<Entities.Projects> _rep_Projects,
IRepository<Entities.Experts> _rep_Experts,
IRepository<Entities.VoteRecords> _rep_VoteRecords,
IRepository<Entities.Projects_2021> _rep_Projects2021,
IRepository<Entities.VoteRecords_2021> _rep_VoteRecords2021,
IRepository<Entities.Projects_2022> _rep_Projects2022,
IRepository<Entities.VoteRecords_2022> _rep_VoteRecords2022,
IRepository<Projects_2025> _rep_Projects2025)
{
//rep_Projects = _rep_Projects;
rep_Experts = _rep_Experts;
rep_VoteRecords = _rep_VoteRecords;
rep_Projects2021 = _rep_Projects2021;
rep_VoteRecords2021 = _rep_VoteRecords2021;
rep_Projects2022 = _rep_Projects2022;
rep_VoteRecords2022 = _rep_VoteRecords2022;
rep_Projects2025 = _rep_Projects2025;
}
/// <summary>
/// 列表
/// </summary>
/// <returns></returns>
[HttpPost]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public async Task<dynamic> List(ProjectsInput args)
{
var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程", "能源工程", "交通工程", "水利工程" };
var data = await rep_Projects2025.DetachedEntities.Where(p => !p.IsDeleted)
.Where(args.type != null, a => (int)a.type == args.type)
.Where(args.is_no_inspection != null, a => (int)a.is_no_inspection == args.is_no_inspection)
.ProjectToType<ProjectsOutput>()
.OrderBy(a => a.serial_number)
.ToListAsync();
var data1 = data.Where(a => a.is_no_inspection == 1).ToList();
var data2 = data.Where(a => a.is_no_inspection == 0).ToList();
return new
{
typeList,
data1,
data2
};
}
/// <summary>
/// 检验提交码
/// </summary>
/// <returns></returns>
[HttpPost]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public async Task<dynamic> CheckSubmitCode(CheckSubmitCodeInput args)
{
var data = await rep_Experts.DetachedEntities.Where(p => !p.IsDeleted)
.Where(a => a.login_code == args.code)
.FirstOrDefaultAsync();
return data != null;
}
/// <summary>
/// 提交
/// </summary>
/// <returns></returns>
[HttpPost]
[UnitOfWork]
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public async Task<dynamic> SubmitSubmitVote(SubmitInput args)
{
try
{
var data = await rep_Experts.DetachedEntities.Where(p => !p.IsDeleted)
.Where(a => a.login_code == args.code)
.FirstOrDefaultAsync();
_ = (data == null) ? throw Oops.Oh("提交码错误") : 1;
//var list = args.projects.Adapt<List<Entities.VoteRecords>>();
//删除这个专家上次提交的结果
//或者提示不能再次提交
_ = (await rep_VoteRecords.DetachedEntities.Where(a => !a.IsDeleted && a.expert_login_code == args.code).CountAsync() > 0) ? throw Oops.Oh("已提交，无需再次提交") : 1;
var now = DateTime.Now;
args.projects.ForEach(async a =>
{
var model = new Entities.VoteRecords
{
expert_login_code = args.code,
project_id = a.id,
is_agree = a.vote,
vote_time = now
};
await model.InsertOrUpdate();
});
return true;
}
catch (Exception ex)
{
return false;
}
}
private async Task<List<ProjectsList2Output>> GetVoteData()
{
var query = from a in rep_Projects2025.DetachedEntities
join b in rep_VoteRecords.DetachedEntities
on a.Id equals b.project_id into grouping
from p in grouping.DefaultIfEmpty()
group new { a, p } by new { a.Id, a.name, a.serial_number, a.type, a.is_no_inspection } into pp
select new ProjectsList2Output
{
serial_number = pp.Key.serial_number,
id = pp.Key.Id,
name = pp.Key.name,
yes_count = pp.Where(a => a.p.is_agree).Count(),
no_count = pp.Where(a => !a.p.is_agree).Count(),
type = pp.Key.type,
is_no_inspection = pp.Key.is_no_inspection
};
return await query.OrderBy(a => a.serial_number).ToListAsync();
}
/// <summary>
/// 列表
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> List2()
{
//var data = rep_Projects.DetachedEntities.Where(p => !p.IsDeleted)
// //.Where(args.type != null, a => (int)a.type == args.type)
// .Join(rep_VoteRecords.DetachedEntities, a => a.Id, a => a.project_id, (a, b) =>
// new
// {
// //a.Id,
// //type = (int)a.type,
// //serial_number = a.serial_number,
// //name = a.name,
// //no_count = b.Where(bb => !bb.is_agree).Count(),
// //yes_count = b.Where(bb => bb.is_agree).Count(),
// }).ToList();
////.ProjectToType<ProjectsList2Output>()
////.OrderBy(a => a.serial_number)
////.ToListAsync();
var data = await GetVoteData();
//var data0 = data.Where(a => a.type == Entities.EnumProjectType.FangJian).ToList();
//var data1 = data.Where(a => a.type == Entities.EnumProjectType.ShiZheng).ToList();
//var data2 = data.Where(a => a.type == Entities.EnumProjectType.GuiDaoGongCheng).ToList();
//var data3 = data.Where(a => a.type == Entities.EnumProjectType.DianLiGongCheng).ToList();
//var data4 = data.Where(a => a.type == Entities.EnumProjectType.JiaoTongGongCheng).ToList();
//var data5 = data.Where(a => a.type == Entities.EnumProjectType.ShuiLiGongCheng).ToList();
//return new
//{
// data0,
// data1,
// data2,
// data3,
// data4,
// data5
//};
var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程", "能源工程", "交通工程", "水利工程" };
return new { data, typeList };
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public async Task<dynamic> Download([FromQuery] int s)
{
var data = await GetVoteData();
var data1 = data.Where(a => a.is_no_inspection == 1).ToList();
var data2 = data.Where(a => a.is_no_inspection == 0).ToList();
//var filepath = Tools.ExcelHelper.WriteTemplate(data, 4, "C");
string template_name = s == 1 ? "票1 免于现场评估项目汇总表投票表格.xlsx" : "票2 现场评估项目（含）现场投票表格.xlsx";
var filepath = Tools.ExcelHelper.WriteTemplate(template_name, s == 1 ? data1 : data2, 5, "C");
return new FileStreamResult(new FileStream(filepath, FileMode.Open), "application/octet-stream") { FileDownloadName = filepath };
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public async Task<dynamic> ExpertVote()
{
try
{
var list = await rep_Experts.DetachedEntities.GroupJoin(rep_VoteRecords.DetachedEntities, a => a.login_code, a => a.expert_login_code, (a, b) => new { a, b })
.SelectMany(a => a.b.DefaultIfEmpty(), (a, b) => new { a.a.Id, a.a.login_code, is_vote = b != null })
.Distinct()
.OrderBy(a => a.Id)
.ToListAsync();
return list;
//var query = from a in rep_Experts.DetachedEntities
// join b in rep_VoteRecords.DetachedEntities on a.login_code equals b.expert_login_code into temp
// from tt in temp.DefaultIfEmpty()
// select new
// {
// a.Id,
// a.login_code,
// is_vote = tt == null
// };
//return await query.ToListAsync();
}
catch (Exception ex)
{ }
return null;
}
/// <summary>
/// 新增专家
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task AddExpert(AddExpertInput args)
{
if (args == null || args.expertnum <= 0)
throw Oops.Oh("参数异常");
try
{
var list = new List<Experts>();
for (int i = 0; i < args.expertnum; i++)
{
var newid = Ulid.NewUlid().ToString();
var newidsimple = newid.ToUpper().Replace("I", "").Replace("L", "").Replace("0", "").Replace("O", "").Replace("1", "");
list.Add(new Experts
{
Id = newid,
login_code = newidsimple.Substring(newidsimple.Length - 6, 6),
CreatedTime = DateTime.Now
});
}
await rep_Experts.InsertAsync(list);
}
catch (Exception ex)
{ }
}
}
}

3
20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
View File

@@ -178,7 +178,8 @@ namespace Vote.Services.ApiController
{
var data = await GetVoteData();
//var filepath = Tools.ExcelHelper.WriteTemplate(data, 4, "C");
var filepath = Tools.ExcelHelper.WriteTemplate(data, 5, "C");
string template_name = "2024年度宁波市结构优质认定项目投票结果.xlsx";
var filepath = Tools.ExcelHelper.WriteTemplate(template_name, data, 5, "C");
return new FileStreamResult(new FileStream(filepath, FileMode.Open), "application/octet-stream") { FileDownloadName = filepath };
}
/// <summary>

3
20220330_Vote/Vote.Services/Dto/ProjectsInput.cs
View File

@@ -15,6 +15,7 @@ namespace Vote.Services.Dto
/// 项目类型
/// </summary>
public int? type { get; set; }
public int? is_no_inspection { get; set; }
}
public class ProjectsOutput
{
@@ -48,6 +49,7 @@ namespace Vote.Services.Dto
///
/// </summary>
public bool vote { get; set; } = false;
public int is_no_inspection { get; set; }
}
public class CheckSubmitCodeInput
{
@@ -116,5 +118,6 @@ namespace Vote.Services.Dto
[Required]
public int expertnum { get; set; }
}
public int is_no_inspection { get; set; }
}
}

4
20220330_Vote/Vote.Services/Entities/Projects.cs
View File

@@ -174,9 +174,9 @@ namespace Vote.Services.Entities
[Description("轨道工程")]
GuiDaoGongCheng = 2,
/// <summary>
/// 电力工程
/// 能源工程
/// </summary>
[Description("电力工程")]
[Description("能源工程")]
DianLiGongCheng = 3,
/// <summary>
/// 交通工程

51
20220330_Vote/Vote.Services/Entities/Projects_2025.cs Normal file
View File

@@ -0,0 +1,51 @@
using Ewide.Core;
using Ewide.Core.Util;
using Furion;
using Furion.DatabaseAccessor;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Vote.Services.Entities
{
/// <summary>
/// 项目表
/// </summary>
public class Projects_2025 : DEntityBase//, IEntitySeedData<Projects>
{
/// <summary>
/// 项目序号
/// </summary>
[Comment("项目序号")]
public int serial_number { get; set; }
/// <summary>
/// 工程名称
/// </summary>
[Comment("工程名称")]
public string name { get; set; }
/// <summary>
/// 项目类型
/// </summary>
[Comment("项目类型")]
public EnumProjectType type { get; set; }
/// <summary>
///
/// </summary>
[NotMapped]
public string type_title
{
get
{
return type.GetEnumDescription();
}
}
public int is_no_inspection { get; set; }
}
}

3
20220330_Vote/Vote.Services/Tools/ExcelHelper.cs
View File

@@ -114,11 +114,10 @@ namespace Vote.Services.Tools
///
/// </summary>
/// <returns></returns>
public static string WriteTemplate(List<ProjectsList2Output> list, int start_row, string start_column)
public static string WriteTemplate(string template_name, List<ProjectsList2Output> list, int start_row, string start_column)
{
try
{
string template_name = "2024年度宁波市结构优质认定项目投票结果.xlsx";
string excelFilePath = $"{App.WebHostEnvironment.WebRootPath}\\ExcelTemplate\\{template_name}";
string outputPath = string.Empty;
if (!string.IsNullOrEmpty(excelFilePath))

76
20220330_Vote/Vote.Services/Vote.Services.xml
View File

@@ -203,6 +203,53 @@
</summary>
<returns></returns>
</member>
<member name="T:Vote.Services.ApiController.Projects2025Service">
<summary>
项目
</summary>
</member>
<member name="M:Vote.Services.ApiController.Projects2025Service.List(Vote.Services.Dto.ProjectsInput)">
<summary>
列表
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.Projects2025Service.CheckSubmitCode(Vote.Services.Dto.CheckSubmitCodeInput)">
<summary>
检验提交码
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.Projects2025Service.SubmitSubmitVote(Vote.Services.Dto.SubmitInput)">
<summary>
提交
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.Projects2025Service.List2">
<summary>
列表
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.Projects2025Service.Download(System.Int32)">
<summary>
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.Projects2025Service.ExpertVote">
<summary>
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.Projects2025Service.AddExpert(Vote.Services.Dto.ProjectsList2Output.AddExpertInput)">
<summary>
新增专家
</summary>
<returns></returns>
</member>
<member name="T:Vote.Services.ApiController.ProjectsService">
<summary>
项目
@@ -933,7 +980,7 @@
</member>
<member name="F:Vote.Services.Entities.EnumProjectType.DianLiGongCheng">
<summary>
电力工程
能源工程
</summary>
</member>
<member name="F:Vote.Services.Entities.EnumProjectType.JiaoTongGongCheng">
@@ -996,6 +1043,31 @@
</summary>
</member>
<member name="T:Vote.Services.Entities.Projects_2025">
<summary>
项目表
</summary>
</member>
<member name="P:Vote.Services.Entities.Projects_2025.serial_number">
<summary>
项目序号
</summary>
</member>
<member name="P:Vote.Services.Entities.Projects_2025.name">
<summary>
工程名称
</summary>
</member>
<member name="P:Vote.Services.Entities.Projects_2025.type">
<summary>
项目类型
</summary>
</member>
<member name="P:Vote.Services.Entities.Projects_2025.type_title">
<summary>
</summary>
</member>
<member name="T:Vote.Services.Entities.VoteRecords">
<summary>
投票记录
@@ -1112,7 +1184,7 @@
<param name="index"></param>
<returns></returns>
</member>
<member name="M:Vote.Services.Tools.ExcelHelper.WriteTemplate(System.Collections.Generic.List{Vote.Services.Dto.ProjectsList2Output},System.Int32,System.String)">
<member name="M:Vote.Services.Tools.ExcelHelper.WriteTemplate(System.String,System.Collections.Generic.List{Vote.Services.Dto.ProjectsList2Output},System.Int32,System.String)">
<summary>
</summary>