2024年度改动

This commit is contained in:
路 范
2024-11-13 18:44:55 +08:00
parent dd63efcfb7
commit 0676cf65ef
11 changed files with 59 additions and 53 deletions

View File

@@ -51,7 +51,7 @@ namespace Vote.Services.ApiController
[Microsoft.AspNetCore.Authorization.AllowAnonymous]
public async Task<dynamic> List(ProjectsInput args)
{
var typeList = new List<string> { "房建工程", "市政工程", "轨道工程", "电力工程", "交通工程", "水利工程" };
var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程" };//, "电力工程", "交通工程", "水利工程" };
var data = await rep_Projects.DetachedEntities.Where(p => !p.IsDeleted)
.Where(args.type != null, a => (int)a.type == args.type)
.ProjectToType<ProjectsOutput>()
@@ -167,7 +167,7 @@ namespace Vote.Services.ApiController
// data4,
// data5
//};
var typeList = new List<string> { "房建工程", "市政工程", "轨道工程", "电力工程", "交通工程", "水利工程" };
var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程" };//, "电力工程", "交通工程", "水利工程" };
return new { data, typeList };
}
/// <summary>

View File

@@ -93,8 +93,8 @@ namespace Vote.Services.Dto
{
get
{
return yes_count >= 11;
//return (yes_count / (yes_count + no_count)) >= (2.0 / 3.0);
return yes_count > 12;
// return (yes_count / (yes_count + no_count)) >= (2.0 / 3.0);
}
}
/// <summary>

View File

@@ -118,7 +118,7 @@ namespace Vote.Services.Tools
{
try
{
string template_name = "2023年度甬江杯投票.xlsx";
string template_name = "2024年度宁波市结构优质认定项目投票结果.xlsx";
string excelFilePath = $"{App.WebHostEnvironment.WebRootPath}\\ExcelTemplate\\{template_name}";
string outputPath = string.Empty;
if (!string.IsNullOrEmpty(excelFilePath))