diff --git a/20220330_Vote/Ewide.EntityFramework.Core/Ewide.EntityFramework.Core.csproj b/20220330_Vote/Ewide.EntityFramework.Core/Ewide.EntityFramework.Core.csproj
index 05d4b4f..20b4ba6 100644
--- a/20220330_Vote/Ewide.EntityFramework.Core/Ewide.EntityFramework.Core.csproj
+++ b/20220330_Vote/Ewide.EntityFramework.Core/Ewide.EntityFramework.Core.csproj
@@ -5,16 +5,20 @@
+
+
+ PreserveNewest
+
PreserveNewest
-
+
PreserveNewest
diff --git a/20220330_Vote/Ewide.EntityFramework.Core/dbsettings.Development-.json b/20220330_Vote/Ewide.EntityFramework.Core/dbsettings.Development-.json
new file mode 100644
index 0000000..ba95e5c
--- /dev/null
+++ b/20220330_Vote/Ewide.EntityFramework.Core/dbsettings.Development-.json
@@ -0,0 +1,42 @@
+{
+ //DefaultConnection这个节点不能删
+ "DefaultConnection": "Data Source=118.178.224.202;Port=3310;Database=yongjiangbei_vote;User ID=root;Password=root.Ewide;pooling=true;sslmode=none;CharSet=utf8;",
+ "ConnectionStrings": [
+ /*
+ MySql = 0,
+ SqlServer = 1,
+ Sqlite = 2,
+ Oracle = 3,
+ PostgreSQL = 4,
+ Dm = 5,
+ Kdbndp = 6
+ */
+ {
+ //目前使用的数据库 Ewide.
+ "Id": "118_3310_ewide",
+ "DBType": 0,
+ "Enabled": true,
+ "ConnectionString": "Data Source=118.178.224.202;Port=3310;Database=yongjiangbei_vote;User ID=root;Password=root.Ewide;pooling=true;sslmode=none;CharSet=utf8;"
+ },
+ {
+ "Id": 1, // 连接id，可以配置到数据库
+ "DBType": 2, // db类型，枚举，具体的看上边
+ "Enabled": false, // 是否开启当前数据库db
+ "Connection": "WMBlog.db" // 连接字符串
+ },
+ {
+ //不知道干什么用的
+ "Id": "PgSqlConnection",
+ "DBType": 4,
+ "Enabled": true,
+ "ConnectionString": "HOST=127.0.0.1;PORT=5432;DATABASE=ewide;PASSWORD=postgres;USER ID=postgres;"
+ },
+ {
+
+ "Id": "MultiTenantConnection",
+ "DBType": 2,
+ "Enabled": true,
+ "ConnectionString": "Data Source=./Dilon_SaaS.db"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/20220330_Vote/Ewide.EntityFramework.Core/dbsettings.Development.json b/20220330_Vote/Ewide.EntityFramework.Core/dbsettings.Development.json
index ba95e5c..c02bee5 100644
--- a/20220330_Vote/Ewide.EntityFramework.Core/dbsettings.Development.json
+++ b/20220330_Vote/Ewide.EntityFramework.Core/dbsettings.Development.json
@@ -1,6 +1,6 @@
{
//DefaultConnection这个节点不能删
- "DefaultConnection": "Data Source=118.178.224.202;Port=3310;Database=yongjiangbei_vote;User ID=root;Password=root.Ewide;pooling=true;sslmode=none;CharSet=utf8;",
+ "DefaultConnection": "Data Source=10.19.94.20;Port=3310;Database=yongjiangbei_vote;User ID=root;Password=Ewide.;pooling=true;sslmode=none;CharSet=utf8;",
"ConnectionStrings": [
/*
MySql = 0,
@@ -11,19 +11,19 @@
Dm = 5,
Kdbndp = 6
*/
- {
- //目前使用的数据库 Ewide.
- "Id": "118_3310_ewide",
- "DBType": 0,
- "Enabled": true,
- "ConnectionString": "Data Source=118.178.224.202;Port=3310;Database=yongjiangbei_vote;User ID=root;Password=root.Ewide;pooling=true;sslmode=none;CharSet=utf8;"
- },
{
"Id": 1, // 连接id，可以配置到数据库
"DBType": 2, // db类型，枚举，具体的看上边
"Enabled": false, // 是否开启当前数据库db
"Connection": "WMBlog.db" // 连接字符串
},
+ {
+ //目前使用的数据库 Ewide.
+ "Id": "118_3310_ewide",
+ "DBType": 0,
+ "Enabled": true,
+ "ConnectionString": ""
+ },
{
//不知道干什么用的
"Id": "PgSqlConnection",
diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2021年度甬江杯投票 - 副本.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2021年度甬江杯投票 - 副本.xlsx
new file mode 100644
index 0000000..c66bf71
Binary files /dev/null and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2021年度甬江杯投票 - 副本.xlsx differ
diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2021年度甬江杯投票.xlsx b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2021年度甬江杯投票.xlsx
index c66bf71..374c145 100644
Binary files a/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2021年度甬江杯投票.xlsx and b/20220330_Vote/Ewide.Web.Entry/wwwroot/ExcelTemplate/2021年度甬江杯投票.xlsx differ
diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html
index 19a7b14..0352786 100644
--- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html
+++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html
@@ -70,7 +70,7 @@
location = 'Expert.html'
},
export_excel() {
- this.download('/gb/yjb/api/projects/download', this.dateFormat("YYYYmmddHHMMSS", new Date()) + "-2022年度甬江杯投票.xlsx", this.loading_false);
+ this.download('/gb/yjb/api/projects/download', this.dateFormat("YYYYmmddHHMMSS", new Date()) + "-2023年度甬江杯投票.xlsx", this.loading_false);
},
check_login() {
this.token = window.sessionStorage.getItem('__TOKEN');
diff --git a/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs b/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
index 53fd14f..498b86d 100644
--- a/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
+++ b/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
@@ -28,11 +28,19 @@ namespace Vote.Services.ApiController
private readonly IRepository rep_Projects;
private readonly IRepository rep_Experts;
private readonly IRepository rep_VoteRecords;
- public ProjectsService(IRepository _rep_Projects, IRepository _rep_Experts, IRepository _rep_VoteRecords)
+ private readonly IRepository rep_Projects2021;
+ private readonly IRepository rep_VoteRecords2021;
+ private readonly IRepository rep_Projects2022;
+ private readonly IRepository rep_VoteRecords2022;
+ public ProjectsService(IRepository _rep_Projects, IRepository _rep_Experts, IRepository _rep_VoteRecords, IRepository _rep_Projects2021, IRepository _rep_VoteRecords2021, IRepository _rep_Projects2022, IRepository _rep_VoteRecords2022)
{
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;
}
///
@@ -104,8 +112,8 @@ namespace Vote.Services.ApiController
}
private async Task> GetVoteData()
{
- var query = from a in rep_Projects.DetachedEntities
- join b in rep_VoteRecords.DetachedEntities
+ var query = from a in rep_Projects2022.DetachedEntities
+ join b in rep_VoteRecords2022.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 } into pp
@@ -169,6 +177,7 @@ namespace Vote.Services.ApiController
public async Task Download()
{
var data = await GetVoteData();
+ //var filepath = Tools.ExcelHelper.WriteTemplate(data, 4, "C");
var filepath = Tools.ExcelHelper.WriteTemplate(data, 5, "C");
return new FileStreamResult(new FileStream(filepath, FileMode.Open), "application/octet-stream") { FileDownloadName = filepath };
}
diff --git a/20220330_Vote/Vote.Services/Entities/Projects_2021.cs b/20220330_Vote/Vote.Services/Entities/Projects_2021.cs
new file mode 100644
index 0000000..513c829
--- /dev/null
+++ b/20220330_Vote/Vote.Services/Entities/Projects_2021.cs
@@ -0,0 +1,156 @@
+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
+{
+ ///
+ /// 项目表
+ ///
+ public class Projects_2021 : DEntityBase//, IEntitySeedData
+ {
+ ///
+ /// 项目序号
+ ///
+ [Comment("项目序号")]
+ public int serial_number { get; set; }
+ ///
+ /// 工程名称
+ ///
+ [Comment("工程名称")]
+ public string name { get; set; }
+ ///
+ /// 项目类型
+ ///
+ [Comment("项目类型")]
+ public EnumProjectType type { get; set; }
+ ///
+ ///
+ ///
+ [NotMapped]
+ public string type_title
+ {
+ get
+ {
+ return type.GetEnumDescription();
+ }
+ }
+ //public IEnumerable HasData(DbContext dbContext, Type dbContextLocator)
+ //{
+ // return new List
+ // {
+ // new Projects { Id = "5921ad9e-7027-446d-aae3-899ad388404b", serial_number = 1, name = "浙江纺织服装职业技术学院中英时尚设计学院综合楼项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "3e458131-6318-4e27-935e-2e4a85c877b1", serial_number = 2, name = "宁波诺丁汉大学图书馆及学习中心项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "03d59313-3e30-4345-920e-e21455c11228", serial_number = 3, name = "高新区滨江绿带整治工程五期（翔海路—大东江）I标段",type= EnumProjectType.FangJian },
+ // new Projects { Id = "94e3b06e-2fa6-4830-8432-383305b237b8", serial_number = 4, name = "太平鸟高新区男装办公楼项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "26f148e5-a44e-47d5-90aa-49136b1efb6d", serial_number = 5, name = "慈城新城高中项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "686d2b36-30a8-47c4-9050-db601d8dcb8c", serial_number = 6, name = "宁海县妇幼保健院保健大楼工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "8118f5fd-8082-4186-a5b4-32490cbadb19", serial_number = 7, name = "宁波市职业技术教育中心学校（荷池校区） 改扩建项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "ecaf4b26-b27e-4eed-bbf2-0deaf52495fa", serial_number = 8, name = "大庆北路地段配套学校（二期）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "bb3eee7a-4846-4177-b377-fd2804d4db72", serial_number = 9, name = "鄞州区钟公庙第二初级中学工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "21a336c4-f730-4244-ae5a-66d4e0f8f356", serial_number = 10, name = "北京航空航天大学宁波创新研究院(研究生院和国际交流中心)一期（实验用房）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "5c504c5d-9d69-4cf8-a483-c8699f0b517e", serial_number = 11, name = "余姚市人民医院肿瘤治疗中心项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "2b257857-4905-4176-bebe-bc8b99eef73b", serial_number = 12, name = "庄市中心学校迁建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "9c16ca23-f3d8-44c9-92d7-d08d6b64e4f9", serial_number = 13, name = "镇海区中心学校新城校区项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "62696ca2-719e-41df-8bad-e182efe84963", serial_number = 14, name = "宁波市海曙区段塘学校扩建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "ef61f197-b194-4190-ab74-f5f78c160bd3", serial_number = 15, name = "慈溪市明月湖幼儿园",type= EnumProjectType.FangJian },
+ // new Projects { Id = "056e05e3-2ae5-4db5-b976-f4a1809a4d1a", serial_number = 16, name = "北仑外国语学校工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "4c9d4677-539c-45c8-8885-45f9d2c1c15e", serial_number = 17, name = "宁波市残疾人康复中心（宁波市康复医院）扩建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "f640a90e-71c1-4142-afb4-b9d68f9ac08f", serial_number = 18, name = "宁波海关宁海办事处检测报关代理服务中心项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "62eb67a1-2584-4b9e-b663-9c6c1b700d42", serial_number = 19, name = "新能源技术与材料综合研发平台- 核用碳化硅纤维及复合材料研发及应用平台项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "23a38e3e-a77c-463c-902e-02088707d1ca", serial_number = 20, name = "东部新城核心区以东片区C1-6#地块邱隘镇九年一贯制学校工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "1e9371d1-8b01-4c55-9431-000a3fffc0b4", serial_number = 21, name = "宁波大红鹰学院象山影视学院工程（二期）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "1f9ae2cf-c7c2-4a57-b678-b0fca4bf4959", serial_number = 22, name = "中国·浙江海洋运动中心（亚帆中心）工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "c0e62c16-bf78-4d82-8dc6-442c1f0c0adc", serial_number = 23, name = "宁波市黄湖监狱迁建项目I标段、Ⅱ标段、Ⅲ标段、装修工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "8be3e94f-0b17-4c97-9b9d-021b922fc6a2", serial_number = 24, name = "新潮塘区块九年一贯制学校新建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "fad24cde-bd7c-40cf-a7e2-ce46e396f489", serial_number = 25, name = "顾国和中学（爱国中学）工程（门卫、教学楼A-C、教学楼D、综合楼、食堂）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "6e52bfbf-4095-4189-b2f7-37eb1ced0ec9", serial_number = 26, name = "庄市街道同心湖幼儿园（暂名）工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "dc22af65-c261-4245-b319-8908fc2e77f6", serial_number = 27, name = "中科院上海药物所宁波临床前研究中心",type= EnumProjectType.FangJian },
+ // new Projects { Id = "09955588-0f17-479b-ba4b-c1f90ca58a85", serial_number = 28, name = "宁波科学中学新建项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "39d80b14-8735-4710-bacb-432fd12dc309", serial_number = 29, name = "白沙路街道后油车股份经济合作社综合服务楼",type= EnumProjectType.FangJian },
+ // new Projects { Id = "aa0e4017-2304-431a-b5ed-b725a77cb810", serial_number = 30, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅴ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "0c3672ab-23f4-4a8d-9de3-97fe401f3aee", serial_number = 31, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅵ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "e7ccba65-414f-4501-af69-4d6722e21d86", serial_number = 32, name = "三官堂大桥及接线（江南路至中官西路）工程（主桥）",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "68f25778-4b2f-4a91-a2dc-640a0622f389", serial_number = 33, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅳ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "03265409-52b0-43dc-85b5-0698a0367211", serial_number = 34, name = "杭甬复线威海互通连接线一期工程（施工）Ⅲ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "c12f36c4-6887-4beb-8b90-1c5b68006af1", serial_number = 35, name = "甬江北岸大庆北路（湖东路-怡西街）道路工程I标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "1d6aafe6-457e-4143-82fe-b1334bdabc45", serial_number = 36, name = "机场快速路南延（鄞州大道-绕城高速）工程施工Ⅰ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "54e26c4e-ffc4-4493-bb4c-3f3f66f46019", serial_number = 37, name = "永泰公园",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "2bc85650-b86d-44de-a152-970928376305", serial_number = 38, name = "三官堂大桥及接线（江南路至中官西路）工程I标",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "5a5dffca-ad94-476a-a25d-b68df2fd4908", serial_number = 39, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅷ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "c970ff56-ff36-4c64-a8a4-832c92e2f4bf", serial_number = 40, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅶ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9742d735-e769-4355-8b26-5067a35b75bf", serial_number = 41, name = "西二环北延工程（明州路-中横线）",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "35870caf-f7f5-4302-95d9-fb0c05462c40", serial_number = 42, name = "鄞奉路（新典路-三孔碶桥）道路工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "b9690320-4839-40bb-8703-3b2724ce0578", serial_number = 43, name = "会展路（盛梅路-沙洲路）及南侧河道绿地工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "7e1989e6-bf05-4fbc-b397-dc74069d301d", serial_number = 44, name = "宁波杭州湾新区南部新城海泉湾规划三路市政工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "016e39e3-6fb9-4d8f-a5f8-2478b4e389e1", serial_number = 45, name = "杭州湾新区滨海新城启动区银滩路等六条路市政工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "b38cedeb-f524-44ef-be8f-6cd1f7c54b59", serial_number = 46, name = "杭甬复线威海互通连接线一期工程（施工）Ⅰ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "8a5fc13a-d5aa-44b2-99dd-c2834ac00520", serial_number = 47, name = "杭甬复线威海互通连接线一期工程（施工）Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "49dd82e4-b9b9-4d26-ae87-9f9092f367d1", serial_number = 48, name = "慈溪市北部污水处理厂提标改造工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a4d7196d-b9f3-439f-8258-4da4c04b177a", serial_number = 49, name = "通途路（世纪大道～东外环）综合管廊工程施工Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "7f046001-a58d-400e-b97d-d4b55f79b6eb", serial_number = 50, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅲ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "bddeb30e-59bb-462b-bb69-5fe557b20614", serial_number = 51, name = "梅山保税港区港湾路（二期）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "cb5725b1-06cd-42da-abc4-c4412cecb627", serial_number = 52, name = "三官堂大桥及接线（江南路至中官西路）工程接线部分II标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "19a78c25-d576-4fa0-872e-ae431a27f1fe", serial_number = 53, name = "霞浦污水泵站污水压力管工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "92d860ce-94f5-4468-976d-6f4bc6d3a005", serial_number = 54, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "320907e0-5092-467c-ad38-9883af7e7694", serial_number = 55, name = "新长邱线拓宽改造工程（施工）2标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9f9d3b0f-0a9d-48cf-98a3-9ec2d805e8a9", serial_number = 56, name = "姚江东路（环城北路-机场路）工程I标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "74c4cf12-880d-49f1-bd53-047bd7f858ac", serial_number = 57, name = "铁路平改立新大路（329国道 -金牌公路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "37a5cc48-fe51-4493-b5bd-2dd0b42088b3", serial_number = 58, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅸ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9ef49c31-8224-4c03-91e8-821d7b36b377", serial_number = 59, name = "姚江南岸滨江休闲带（机场路-青林渡路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "8424686e-6e8a-49ca-b1db-8635ebda2157", serial_number = 60, name = "宁波北仑柴桥净化水厂EPC总承包项目",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "44eebc4d-b467-477b-8c01-65931593722a", serial_number = 61, name = "沿山干河、陈渡界北三河周边剩余地块绿带工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "5c4796db-5b4a-4259-b8b1-d89846d984ee", serial_number = 62, name = "铸锋路（康庄北路-通园路）拓宽改建工程Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a4054e2d-7f81-411e-8673-7b05938654f7", serial_number = 63, name = "柴桥临港产业园横二路（纬中路-环区路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "85f873b8-ae62-4e5a-bab8-92332304368a", serial_number = 64, name = "机场快速路南延工程（绕城高速至岳林东路南）施工Ⅰ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "5e0e10fa-a4cc-4a7f-b5a5-9b0ca0e0a9af", serial_number = 65, name = "宁波杭州湾新区南部新城海泉湾博华路市政工程项目/宁波杭州湾新区南部新城海泉湾规划二路市政工程项目",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "562be9ce-e9fd-4d81-b8a2-636fbc25d9c1", serial_number = 66, name = "宁波杭州湾新区海川大道（七塘公路—滨海一路）市政工程标段Ⅰ",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "d52f2db9-07a5-4b77-add5-65c3b0a021e1", serial_number = 67, name = "梅景路改造（冬青路-渡驾桥江）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a9be40e3-99b3-4d94-aaaa-92711f853075", serial_number = 68, name = "云飞路三期（康庄南路-长岛花园东侧路）工 程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9b654b10-36d8-4530-8390-1406dc38bd84", serial_number = 69, name = "应家经济适用房东侧保障性住房区块3#-1、4#地块项目景观绿化及市政附属工程（施工）一标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "594b2558-3c4d-4af5-a79e-17c74886b0b9", serial_number = 70, name = "应家经济适用房东侧保障性住房区块3#-1、4#地块项目景观绿化及市政附属工程（施工）二标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a3667aa7-9403-4cc6-a85e-42b96815ac32", serial_number = 71, name = "灵岩山路东延及沿山河南路延伸段工程一期",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "6e8d85df-e9ed-4386-9b15-7c19eaccb199", serial_number = 72, name = "慈溪高新区基础设施建设四期",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "996d15ac-467d-4ff8-8935-76517cc84fb7", serial_number = 73, name = "慈溪滨海经济开发区龙山滨海新城蓬苑路（横五路-横四路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "91fd6b72-a524-480d-aadf-6e3bae73fbcb", serial_number = 74, name = "宁波市轨道交通4号线土建工程TJ4001标段（翠柏里站）施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "051a42c4-d157-47db-9887-12d5ea917922", serial_number = 75, name = "宁波市轨道交通4号线土建工程TJ4011标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "a25b1db3-23a2-4ea5-b10c-f020325c292f", serial_number = 76, name = "宁波市轨道交通4号线工程供电系统安装施工Ⅱ标段",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "5a9e2016-1c56-4435-8aed-4221bff231da", serial_number = 77, name = "宁波市轨道交通4号线土建工程（第一批）TJ4015标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "9c670713-7d5f-4372-ab7c-246e8e6dd3cf", serial_number = 78, name = "宁波市轨道交通4号线土建工程TJ4013标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "e4f7391b-a0a4-48d0-a803-4be81e52bbb9", serial_number = 79, name = "宁波市轨道交通4号线工程JDSG4006标段车站机电安装施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "d7c8a941-e37a-4889-b862-2b4c2fb8a992", serial_number = 80, name = "宁波市轨道交通4号线土建工程（第四批）TJ4008标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "1ed52273-3c72-4f79-919c-0c4020e4cdf3", serial_number = 81, name = "宁波市轨道交通4号线土建工程（第四批）TJ4017标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "aa28f286-cc5d-4051-978d-43ef4014cf5e", serial_number = 82, name = "宁波市轨道交通4号线土建工程TJ4016标",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "a3f6eea4-0349-4ddd-bfa7-33c0427bc90a", serial_number = 83, name = "宁波市轨道交通4号线工程地下段轨道工程施工Ⅱ标段",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "c04fa383-a9b0-47e4-a91c-9f1b657ac55b", serial_number = 84, name = "宁波市轨道交通4号线土建工程（第二批）TJ4004标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "40b27864-99c0-4d04-889c-5f9ff17cf726", serial_number = 85, name = "宁波市轨道交通4号线土建工程TJ4018标",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "b05f4d26-1b04-4a23-a295-8848ce4aa73e", serial_number = 86, name = "宁波市轨道交通4号线土建工程TJ4012标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "424b6a6a-8e16-4e5e-936b-25a73a3c244b", serial_number = 87, name = "宁波市轨道交通4号线土建工程（第五批）TJ4007标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "1a317eb0-a5fd-420a-b273-ca9d6a006921", serial_number = 88, name = "宁波市轨道交通4号线工程地下段轨道工程施工I标段",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "8fce8773-1eb4-4031-b9bd-60ce0fab8c18", serial_number = 89, name = "宁波市轨道交通4号线工程JDSG4004标段车站机电安装施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "d25f90c3-8125-4821-86cf-fbd3b879dd4b", serial_number = 90, name = "宁波市轨道交通4号线土建工程（第四批）TJ4003标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "25d0bc9e-30db-4768-9996-624312a0450c", serial_number = 91, name = "协丰220千伏变电站工程",type= EnumProjectType.DianLiGongCheng },
+ // new Projects { Id = "1d3333dd-ed50-4dcc-b210-2d44190febde", serial_number = 92, name = "新乐220千伏变电站整体改造工程",type= EnumProjectType.DianLiGongCheng },
+ // new Projects { Id = "b23702d5-9c73-4c79-aa63-fe2245f4d65d", serial_number = 93, name = "38省道宁海桥头胡至深甽段改建工程",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "88909223-8273-4b3d-9b56-ba32e038ed35", serial_number = 94, name = "71省道盛宁线东陈至茅洋段改建工程",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "f3ed2aeb-ac40-4580-bb37-008bea343731", serial_number = 95, name = "明州大道（洞桥至云龙段）工程第IV-2合同段",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "4743c1eb-7135-4ea9-81f8-cf6d825e0ad5", serial_number = 96, name = "沿海中线北仑郭巨段(郭巨互通-北堤互通)拓宽工程",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "4dcf10bd-93e6-43aa-8e18-9410392a8701", serial_number = 97, name = "梅山磨头碶移位及配套河道工程",type= EnumProjectType.ShuiLiGongCheng },
+ // new Projects { Id = "88b56348-6d04-45b4-8dc5-ba4c3b5303a7", serial_number = 98, name = "余姚市海塘除险治江围涂四期工程--临海北顺堤堤顶道路、堤岸防护及河道配套工程",type= EnumProjectType.ShuiLiGongCheng },
+ // new Projects { Id = "f2dc17f8-7bd1-4f6e-b16a-674e1ec34ed0", serial_number = 99, name = "庄桥机场周边区域水环境治理工程（江北大河整治工程二期庄桥段）",type= EnumProjectType.ShuiLiGongCheng },
+ // new Projects { Id = "64d400e2-0247-4c74-a02e-f32753292095", serial_number = 100, name = "掌起镇任佳溪村防洪分流（小流域治理）工程",type= EnumProjectType.ShuiLiGongCheng },
+ // };
+ //}
+ }
+
+}
diff --git a/20220330_Vote/Vote.Services/Entities/Projects_2022.cs b/20220330_Vote/Vote.Services/Entities/Projects_2022.cs
new file mode 100644
index 0000000..de3aaf3
--- /dev/null
+++ b/20220330_Vote/Vote.Services/Entities/Projects_2022.cs
@@ -0,0 +1,156 @@
+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
+{
+ ///
+ /// 项目表
+ ///
+ public class Projects_2022 : DEntityBase//, IEntitySeedData
+ {
+ ///
+ /// 项目序号
+ ///
+ [Comment("项目序号")]
+ public int serial_number { get; set; }
+ ///
+ /// 工程名称
+ ///
+ [Comment("工程名称")]
+ public string name { get; set; }
+ ///
+ /// 项目类型
+ ///
+ [Comment("项目类型")]
+ public EnumProjectType type { get; set; }
+ ///
+ ///
+ ///
+ [NotMapped]
+ public string type_title
+ {
+ get
+ {
+ return type.GetEnumDescription();
+ }
+ }
+ //public IEnumerable HasData(DbContext dbContext, Type dbContextLocator)
+ //{
+ // return new List
+ // {
+ // new Projects { Id = "5921ad9e-7027-446d-aae3-899ad388404b", serial_number = 1, name = "浙江纺织服装职业技术学院中英时尚设计学院综合楼项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "3e458131-6318-4e27-935e-2e4a85c877b1", serial_number = 2, name = "宁波诺丁汉大学图书馆及学习中心项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "03d59313-3e30-4345-920e-e21455c11228", serial_number = 3, name = "高新区滨江绿带整治工程五期（翔海路—大东江）I标段",type= EnumProjectType.FangJian },
+ // new Projects { Id = "94e3b06e-2fa6-4830-8432-383305b237b8", serial_number = 4, name = "太平鸟高新区男装办公楼项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "26f148e5-a44e-47d5-90aa-49136b1efb6d", serial_number = 5, name = "慈城新城高中项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "686d2b36-30a8-47c4-9050-db601d8dcb8c", serial_number = 6, name = "宁海县妇幼保健院保健大楼工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "8118f5fd-8082-4186-a5b4-32490cbadb19", serial_number = 7, name = "宁波市职业技术教育中心学校（荷池校区） 改扩建项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "ecaf4b26-b27e-4eed-bbf2-0deaf52495fa", serial_number = 8, name = "大庆北路地段配套学校（二期）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "bb3eee7a-4846-4177-b377-fd2804d4db72", serial_number = 9, name = "鄞州区钟公庙第二初级中学工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "21a336c4-f730-4244-ae5a-66d4e0f8f356", serial_number = 10, name = "北京航空航天大学宁波创新研究院(研究生院和国际交流中心)一期（实验用房）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "5c504c5d-9d69-4cf8-a483-c8699f0b517e", serial_number = 11, name = "余姚市人民医院肿瘤治疗中心项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "2b257857-4905-4176-bebe-bc8b99eef73b", serial_number = 12, name = "庄市中心学校迁建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "9c16ca23-f3d8-44c9-92d7-d08d6b64e4f9", serial_number = 13, name = "镇海区中心学校新城校区项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "62696ca2-719e-41df-8bad-e182efe84963", serial_number = 14, name = "宁波市海曙区段塘学校扩建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "ef61f197-b194-4190-ab74-f5f78c160bd3", serial_number = 15, name = "慈溪市明月湖幼儿园",type= EnumProjectType.FangJian },
+ // new Projects { Id = "056e05e3-2ae5-4db5-b976-f4a1809a4d1a", serial_number = 16, name = "北仑外国语学校工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "4c9d4677-539c-45c8-8885-45f9d2c1c15e", serial_number = 17, name = "宁波市残疾人康复中心（宁波市康复医院）扩建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "f640a90e-71c1-4142-afb4-b9d68f9ac08f", serial_number = 18, name = "宁波海关宁海办事处检测报关代理服务中心项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "62eb67a1-2584-4b9e-b663-9c6c1b700d42", serial_number = 19, name = "新能源技术与材料综合研发平台- 核用碳化硅纤维及复合材料研发及应用平台项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "23a38e3e-a77c-463c-902e-02088707d1ca", serial_number = 20, name = "东部新城核心区以东片区C1-6#地块邱隘镇九年一贯制学校工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "1e9371d1-8b01-4c55-9431-000a3fffc0b4", serial_number = 21, name = "宁波大红鹰学院象山影视学院工程（二期）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "1f9ae2cf-c7c2-4a57-b678-b0fca4bf4959", serial_number = 22, name = "中国·浙江海洋运动中心（亚帆中心）工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "c0e62c16-bf78-4d82-8dc6-442c1f0c0adc", serial_number = 23, name = "宁波市黄湖监狱迁建项目I标段、Ⅱ标段、Ⅲ标段、装修工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "8be3e94f-0b17-4c97-9b9d-021b922fc6a2", serial_number = 24, name = "新潮塘区块九年一贯制学校新建工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "fad24cde-bd7c-40cf-a7e2-ce46e396f489", serial_number = 25, name = "顾国和中学（爱国中学）工程（门卫、教学楼A-C、教学楼D、综合楼、食堂）",type= EnumProjectType.FangJian },
+ // new Projects { Id = "6e52bfbf-4095-4189-b2f7-37eb1ced0ec9", serial_number = 26, name = "庄市街道同心湖幼儿园（暂名）工程",type= EnumProjectType.FangJian },
+ // new Projects { Id = "dc22af65-c261-4245-b319-8908fc2e77f6", serial_number = 27, name = "中科院上海药物所宁波临床前研究中心",type= EnumProjectType.FangJian },
+ // new Projects { Id = "09955588-0f17-479b-ba4b-c1f90ca58a85", serial_number = 28, name = "宁波科学中学新建项目",type= EnumProjectType.FangJian },
+ // new Projects { Id = "39d80b14-8735-4710-bacb-432fd12dc309", serial_number = 29, name = "白沙路街道后油车股份经济合作社综合服务楼",type= EnumProjectType.FangJian },
+ // new Projects { Id = "aa0e4017-2304-431a-b5ed-b725a77cb810", serial_number = 30, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅴ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "0c3672ab-23f4-4a8d-9de3-97fe401f3aee", serial_number = 31, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅵ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "e7ccba65-414f-4501-af69-4d6722e21d86", serial_number = 32, name = "三官堂大桥及接线（江南路至中官西路）工程（主桥）",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "68f25778-4b2f-4a91-a2dc-640a0622f389", serial_number = 33, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅳ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "03265409-52b0-43dc-85b5-0698a0367211", serial_number = 34, name = "杭甬复线威海互通连接线一期工程（施工）Ⅲ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "c12f36c4-6887-4beb-8b90-1c5b68006af1", serial_number = 35, name = "甬江北岸大庆北路（湖东路-怡西街）道路工程I标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "1d6aafe6-457e-4143-82fe-b1334bdabc45", serial_number = 36, name = "机场快速路南延（鄞州大道-绕城高速）工程施工Ⅰ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "54e26c4e-ffc4-4493-bb4c-3f3f66f46019", serial_number = 37, name = "永泰公园",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "2bc85650-b86d-44de-a152-970928376305", serial_number = 38, name = "三官堂大桥及接线（江南路至中官西路）工程I标",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "5a5dffca-ad94-476a-a25d-b68df2fd4908", serial_number = 39, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅷ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "c970ff56-ff36-4c64-a8a4-832c92e2f4bf", serial_number = 40, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅶ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9742d735-e769-4355-8b26-5067a35b75bf", serial_number = 41, name = "西二环北延工程（明州路-中横线）",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "35870caf-f7f5-4302-95d9-fb0c05462c40", serial_number = 42, name = "鄞奉路（新典路-三孔碶桥）道路工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "b9690320-4839-40bb-8703-3b2724ce0578", serial_number = 43, name = "会展路（盛梅路-沙洲路）及南侧河道绿地工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "7e1989e6-bf05-4fbc-b397-dc74069d301d", serial_number = 44, name = "宁波杭州湾新区南部新城海泉湾规划三路市政工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "016e39e3-6fb9-4d8f-a5f8-2478b4e389e1", serial_number = 45, name = "杭州湾新区滨海新城启动区银滩路等六条路市政工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "b38cedeb-f524-44ef-be8f-6cd1f7c54b59", serial_number = 46, name = "杭甬复线威海互通连接线一期工程（施工）Ⅰ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "8a5fc13a-d5aa-44b2-99dd-c2834ac00520", serial_number = 47, name = "杭甬复线威海互通连接线一期工程（施工）Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "49dd82e4-b9b9-4d26-ae87-9f9092f367d1", serial_number = 48, name = "慈溪市北部污水处理厂提标改造工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a4d7196d-b9f3-439f-8258-4da4c04b177a", serial_number = 49, name = "通途路（世纪大道～东外环）综合管廊工程施工Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "7f046001-a58d-400e-b97d-d4b55f79b6eb", serial_number = 50, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅲ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "bddeb30e-59bb-462b-bb69-5fe557b20614", serial_number = 51, name = "梅山保税港区港湾路（二期）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "cb5725b1-06cd-42da-abc4-c4412cecb627", serial_number = 52, name = "三官堂大桥及接线（江南路至中官西路）工程接线部分II标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "19a78c25-d576-4fa0-872e-ae431a27f1fe", serial_number = 53, name = "霞浦污水泵站污水压力管工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "92d860ce-94f5-4468-976d-6f4bc6d3a005", serial_number = 54, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "320907e0-5092-467c-ad38-9883af7e7694", serial_number = 55, name = "新长邱线拓宽改造工程（施工）2标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9f9d3b0f-0a9d-48cf-98a3-9ec2d805e8a9", serial_number = 56, name = "姚江东路（环城北路-机场路）工程I标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "74c4cf12-880d-49f1-bd53-047bd7f858ac", serial_number = 57, name = "铁路平改立新大路（329国道 -金牌公路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "37a5cc48-fe51-4493-b5bd-2dd0b42088b3", serial_number = 58, name = "机场快速路南延南段（绕城高速-岳林东路）工程施工Ⅸ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9ef49c31-8224-4c03-91e8-821d7b36b377", serial_number = 59, name = "姚江南岸滨江休闲带（机场路-青林渡路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "8424686e-6e8a-49ca-b1db-8635ebda2157", serial_number = 60, name = "宁波北仑柴桥净化水厂EPC总承包项目",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "44eebc4d-b467-477b-8c01-65931593722a", serial_number = 61, name = "沿山干河、陈渡界北三河周边剩余地块绿带工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "5c4796db-5b4a-4259-b8b1-d89846d984ee", serial_number = 62, name = "铸锋路（康庄北路-通园路）拓宽改建工程Ⅱ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a4054e2d-7f81-411e-8673-7b05938654f7", serial_number = 63, name = "柴桥临港产业园横二路（纬中路-环区路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "85f873b8-ae62-4e5a-bab8-92332304368a", serial_number = 64, name = "机场快速路南延工程（绕城高速至岳林东路南）施工Ⅰ标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "5e0e10fa-a4cc-4a7f-b5a5-9b0ca0e0a9af", serial_number = 65, name = "宁波杭州湾新区南部新城海泉湾博华路市政工程项目/宁波杭州湾新区南部新城海泉湾规划二路市政工程项目",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "562be9ce-e9fd-4d81-b8a2-636fbc25d9c1", serial_number = 66, name = "宁波杭州湾新区海川大道（七塘公路—滨海一路）市政工程标段Ⅰ",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "d52f2db9-07a5-4b77-add5-65c3b0a021e1", serial_number = 67, name = "梅景路改造（冬青路-渡驾桥江）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a9be40e3-99b3-4d94-aaaa-92711f853075", serial_number = 68, name = "云飞路三期（康庄南路-长岛花园东侧路）工 程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "9b654b10-36d8-4530-8390-1406dc38bd84", serial_number = 69, name = "应家经济适用房东侧保障性住房区块3#-1、4#地块项目景观绿化及市政附属工程（施工）一标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "594b2558-3c4d-4af5-a79e-17c74886b0b9", serial_number = 70, name = "应家经济适用房东侧保障性住房区块3#-1、4#地块项目景观绿化及市政附属工程（施工）二标段",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "a3667aa7-9403-4cc6-a85e-42b96815ac32", serial_number = 71, name = "灵岩山路东延及沿山河南路延伸段工程一期",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "6e8d85df-e9ed-4386-9b15-7c19eaccb199", serial_number = 72, name = "慈溪高新区基础设施建设四期",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "996d15ac-467d-4ff8-8935-76517cc84fb7", serial_number = 73, name = "慈溪滨海经济开发区龙山滨海新城蓬苑路（横五路-横四路）工程",type= EnumProjectType.ShiZheng },
+ // new Projects { Id = "91fd6b72-a524-480d-aadf-6e3bae73fbcb", serial_number = 74, name = "宁波市轨道交通4号线土建工程TJ4001标段（翠柏里站）施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "051a42c4-d157-47db-9887-12d5ea917922", serial_number = 75, name = "宁波市轨道交通4号线土建工程TJ4011标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "a25b1db3-23a2-4ea5-b10c-f020325c292f", serial_number = 76, name = "宁波市轨道交通4号线工程供电系统安装施工Ⅱ标段",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "5a9e2016-1c56-4435-8aed-4221bff231da", serial_number = 77, name = "宁波市轨道交通4号线土建工程（第一批）TJ4015标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "9c670713-7d5f-4372-ab7c-246e8e6dd3cf", serial_number = 78, name = "宁波市轨道交通4号线土建工程TJ4013标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "e4f7391b-a0a4-48d0-a803-4be81e52bbb9", serial_number = 79, name = "宁波市轨道交通4号线工程JDSG4006标段车站机电安装施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "d7c8a941-e37a-4889-b862-2b4c2fb8a992", serial_number = 80, name = "宁波市轨道交通4号线土建工程（第四批）TJ4008标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "1ed52273-3c72-4f79-919c-0c4020e4cdf3", serial_number = 81, name = "宁波市轨道交通4号线土建工程（第四批）TJ4017标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "aa28f286-cc5d-4051-978d-43ef4014cf5e", serial_number = 82, name = "宁波市轨道交通4号线土建工程TJ4016标",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "a3f6eea4-0349-4ddd-bfa7-33c0427bc90a", serial_number = 83, name = "宁波市轨道交通4号线工程地下段轨道工程施工Ⅱ标段",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "c04fa383-a9b0-47e4-a91c-9f1b657ac55b", serial_number = 84, name = "宁波市轨道交通4号线土建工程（第二批）TJ4004标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "40b27864-99c0-4d04-889c-5f9ff17cf726", serial_number = 85, name = "宁波市轨道交通4号线土建工程TJ4018标",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "b05f4d26-1b04-4a23-a295-8848ce4aa73e", serial_number = 86, name = "宁波市轨道交通4号线土建工程TJ4012标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "424b6a6a-8e16-4e5e-936b-25a73a3c244b", serial_number = 87, name = "宁波市轨道交通4号线土建工程（第五批）TJ4007标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "1a317eb0-a5fd-420a-b273-ca9d6a006921", serial_number = 88, name = "宁波市轨道交通4号线工程地下段轨道工程施工I标段",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "8fce8773-1eb4-4031-b9bd-60ce0fab8c18", serial_number = 89, name = "宁波市轨道交通4号线工程JDSG4004标段车站机电安装施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "d25f90c3-8125-4821-86cf-fbd3b879dd4b", serial_number = 90, name = "宁波市轨道交通4号线土建工程（第四批）TJ4003标段施工",type= EnumProjectType.GuiDaoGongCheng },
+ // new Projects { Id = "25d0bc9e-30db-4768-9996-624312a0450c", serial_number = 91, name = "协丰220千伏变电站工程",type= EnumProjectType.DianLiGongCheng },
+ // new Projects { Id = "1d3333dd-ed50-4dcc-b210-2d44190febde", serial_number = 92, name = "新乐220千伏变电站整体改造工程",type= EnumProjectType.DianLiGongCheng },
+ // new Projects { Id = "b23702d5-9c73-4c79-aa63-fe2245f4d65d", serial_number = 93, name = "38省道宁海桥头胡至深甽段改建工程",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "88909223-8273-4b3d-9b56-ba32e038ed35", serial_number = 94, name = "71省道盛宁线东陈至茅洋段改建工程",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "f3ed2aeb-ac40-4580-bb37-008bea343731", serial_number = 95, name = "明州大道（洞桥至云龙段）工程第IV-2合同段",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "4743c1eb-7135-4ea9-81f8-cf6d825e0ad5", serial_number = 96, name = "沿海中线北仑郭巨段(郭巨互通-北堤互通)拓宽工程",type= EnumProjectType.JiaoTongGongCheng },
+ // new Projects { Id = "4dcf10bd-93e6-43aa-8e18-9410392a8701", serial_number = 97, name = "梅山磨头碶移位及配套河道工程",type= EnumProjectType.ShuiLiGongCheng },
+ // new Projects { Id = "88b56348-6d04-45b4-8dc5-ba4c3b5303a7", serial_number = 98, name = "余姚市海塘除险治江围涂四期工程--临海北顺堤堤顶道路、堤岸防护及河道配套工程",type= EnumProjectType.ShuiLiGongCheng },
+ // new Projects { Id = "f2dc17f8-7bd1-4f6e-b16a-674e1ec34ed0", serial_number = 99, name = "庄桥机场周边区域水环境治理工程（江北大河整治工程二期庄桥段）",type= EnumProjectType.ShuiLiGongCheng },
+ // new Projects { Id = "64d400e2-0247-4c74-a02e-f32753292095", serial_number = 100, name = "掌起镇任佳溪村防洪分流（小流域治理）工程",type= EnumProjectType.ShuiLiGongCheng },
+ // };
+ //}
+ }
+
+}
diff --git a/20220330_Vote/Vote.Services/Entities/VoteRecords_2021.cs b/20220330_Vote/Vote.Services/Entities/VoteRecords_2021.cs
new file mode 100644
index 0000000..158cc0f
--- /dev/null
+++ b/20220330_Vote/Vote.Services/Entities/VoteRecords_2021.cs
@@ -0,0 +1,42 @@
+using Ewide.Core;
+using Furion.DatabaseAccessor;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Vote.Services.Entities
+{
+ ///
+ /// 投票记录
+ ///
+ public class VoteRecords_2021 : DEntityBase
+ {
+ ///
+ /// 专家
+ ///
+ [Comment("专家")]
+ [MaxLength(36)]
+ public string expert_login_code { get; set; }
+ ///
+ /// 项目Id
+ ///
+ [Comment("项目Id")]
+ [MaxLength(36)]
+ public string project_id { get; set; }
+ ///
+ /// 是否同意
+ ///
+ [Comment("是否同意")]
+ public bool is_agree { get; set; }
+ ///
+ /// 投票时间
+ ///
+ [Comment("投票时间")]
+ public DateTime vote_time { get; set; }
+ }
+
+}
diff --git a/20220330_Vote/Vote.Services/Entities/VoteRecords_2022.cs b/20220330_Vote/Vote.Services/Entities/VoteRecords_2022.cs
new file mode 100644
index 0000000..2041534
--- /dev/null
+++ b/20220330_Vote/Vote.Services/Entities/VoteRecords_2022.cs
@@ -0,0 +1,42 @@
+using Ewide.Core;
+using Furion.DatabaseAccessor;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Vote.Services.Entities
+{
+ ///
+ /// 投票记录
+ ///
+ public class VoteRecords_2022 : DEntityBase
+ {
+ ///
+ /// 专家
+ ///
+ [Comment("专家")]
+ [MaxLength(36)]
+ public string expert_login_code { get; set; }
+ ///
+ /// 项目Id
+ ///
+ [Comment("项目Id")]
+ [MaxLength(36)]
+ public string project_id { get; set; }
+ ///
+ /// 是否同意
+ ///
+ [Comment("是否同意")]
+ public bool is_agree { get; set; }
+ ///
+ /// 投票时间
+ ///
+ [Comment("投票时间")]
+ public DateTime vote_time { get; set; }
+ }
+
+}
diff --git a/20220330_Vote/Vote.Services/Vote.Services.xml b/20220330_Vote/Vote.Services/Vote.Services.xml
index b8bbdb7..d716f93 100644
--- a/20220330_Vote/Vote.Services/Vote.Services.xml
+++ b/20220330_Vote/Vote.Services/Vote.Services.xml
@@ -946,6 +946,56 @@
水利工程
+
+
+ 项目表
+
+
+
+
+ 项目序号
+
+
+
+
+ 工程名称
+
+
+
+
+ 项目类型
+
+
+
+
+
+
+
+
+
+ 项目表
+
+
+
+
+ 项目序号
+
+
+
+
+ 工程名称
+
+
+
+
+ 项目类型
+
+
+
+
+
+
+
投票记录
@@ -971,6 +1021,56 @@
投票时间
+
+
+ 投票记录
+
+
+
+
+ 专家
+
+
+
+
+ 项目Id
+
+
+
+
+ 是否同意
+
+
+
+
+ 投票时间
+
+
+
+
+ 投票记录
+
+
+
+
+ 专家
+
+
+
+
+ 项目Id
+
+
+
+
+ 是否同意
+
+
+
+
+ 投票时间
+
+