From ea4715a8bb6708116936e822505edfb8975dbb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com> Date: Sun, 24 Nov 2024 21:47:49 +0800 Subject: [PATCH 1/5] ? --- asg_form/Controllers/AssignmentController.cs | 15 +---------- .../Teamregistration/RegisterController.cs | 25 ++++++++++++++++++- .../Controllers/auditAndFilingController.cs | 17 ++++++++++++- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/asg_form/Controllers/AssignmentController.cs b/asg_form/Controllers/AssignmentController.cs index 5896860..4997f70 100644 --- a/asg_form/Controllers/AssignmentController.cs +++ b/asg_form/Controllers/AssignmentController.cs @@ -5,26 +5,13 @@ using Manganese.Array; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.SignalR; -using NPOI.HPSF; using System.Security.Claims; -using static Microsoft.EntityFrameworkCore.DbLoggerCategory; -using System.Web; -using System.Net.NetworkInformation; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal; -using NPOI.SS.Formula.Functions; using Microsoft.EntityFrameworkCore; -using Flandre.Core.Models; -using Mirai.Net.Sessions.Http.Managers; using Mirai.Net.Utils.Scaffolds; using Flandre.Core.Messaging.Segments; using Flandre.Core.Messaging; using Flandre.Core.Common; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using static asg_form.Controllers.InviteReferee; -using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext; -using AngleSharp.Css; + namespace asg_form.Controllers { diff --git a/asg_form/Controllers/Teamregistration/RegisterController.cs b/asg_form/Controllers/Teamregistration/RegisterController.cs index 532e4cd..c0344ab 100644 --- a/asg_form/Controllers/Teamregistration/RegisterController.cs +++ b/asg_form/Controllers/Teamregistration/RegisterController.cs @@ -10,6 +10,7 @@ using Flandre.Core.Common; using Flandre.Core.Messaging.Segments; using Flandre.Core.Messaging; using static asg_form.Controllers.InviteReferee; +using asg_form.Controllers.Store; namespace asg_form.Controllers.Teamregistration { @@ -29,6 +30,7 @@ namespace asg_form.Controllers.Teamregistration public string approval_time { get; set; } public string status { get; set; } public string biz_type { get; set; } + public string req_role { get; set; } } public class userMsg { @@ -42,6 +44,7 @@ namespace asg_form.Controllers.Teamregistration public string? contactNumber { get; set; } public int? id { get; set; } public string bizType { get; set; } + public string reqRole { get; set; } } public class RegisterController : ControllerBase { @@ -90,6 +93,7 @@ namespace asg_form.Controllers.Teamregistration approval_person = "未审核", approval_time = "未审核", biz_type = msg.bizType, + req_role = msg.reqRole, }; sub.T_Comform.Add(rgst); await sub.SaveChangesAsync(); @@ -125,6 +129,7 @@ namespace asg_form.Controllers.Teamregistration query.create_time = dateString; query.status = "1"; query.biz_type = msg.bizType; + query.req_role = msg.reqRole; await sub.SaveChangesAsync(); string mesg = $"［ASG管理系统］有新解说申请，请及时上后台系统审批。"; string qqgroup = "925510646"; @@ -183,7 +188,8 @@ namespace asg_form.Controllers.Teamregistration createTime = form.create_time, approvalPerson = form.approval_person, approvalTime = form.approval_time, - status = form.status + status = form.status, + reqRole = form.req_role, }; await sub.SaveChangesAsync(); return Ok(new { code = 200, message = "成功修改", data = result }); @@ -278,4 +284,21 @@ namespace asg_form.Controllers.Teamregistration return Ok(new error_mb { code = 401, message = "没有管理员，无法设置" }); } } + /// + /// 根据主键id找申请表所有内容T_Comform + /// + [Route("api/v1/admin/findFormById")] + [HttpGet] + [Authorize] + public async Task> find_by_id(int Id) + { + string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; + var user = await userManager.FindByIdAsync(userId); + if (!this.User.FindAll(ClaimTypes.Role).Any(a => a.Value == "admin")) + { + return Ok(new error_mb { code = 401, message = "无权访问" }); + + } + + } } diff --git a/asg_form/Controllers/auditAndFilingController.cs b/asg_form/Controllers/auditAndFilingController.cs index 2161980..7acbcbb 100644 --- a/asg_form/Controllers/auditAndFilingController.cs +++ b/asg_form/Controllers/auditAndFilingController.cs @@ -28,6 +28,9 @@ namespace asg_form.Controllers { public string reason { get; set; } public string supplementary_info { get; set; } public string status { get; set; } + public int? relative_id { get; set; } + public int node_index { get; set; } + public string flow_config { get; set; } } public class FileFront @@ -49,6 +52,9 @@ namespace asg_form.Controllers { public string reason { get; set; } public string supplementaryInfo { get; set; } public string status { get; set; } + public int? relativeId { get; set; } + public int nodeIndex { get; set; } + public string flowConfig { get; set; } } public class auditAndFilingController : ControllerBase @@ -98,7 +104,16 @@ namespace asg_form.Controllers { au.description = auditinfo.description; au.reason = auditinfo.reason; au.start_person_id = auditinfo.startPersonId; - au.start_person = auditinfo.startPerson; + au.start_person = auditinfo.startPerson; + if(auditinfo.relativeId != null) + { + if(!query.Any(n => n.relative_id == auditinfo.relativeId)) + { + au.relative_id = auditinfo.relativeId; + } + au.node_index = auditinfo.nodeIndex; + au.flow_config = auditinfo.flowConfig; + } sub.SaveChanges(); return Ok(new { code = 200, message = "成功修改" }); } From a3f4bffcc53e3186a2568e2be1c91b3327aa5e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com> Date: Sun, 24 Nov 2024 21:54:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?11.24=E7=9A=84=E6=9B=B4=E6=96=B0=EF=BC=8C?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E6=98=AF=E5=AE=A1=E6=A0=B8=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=92=8C=E7=94=B3=E8=AF=B7=E8=A1=A8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Teamregistration/RegisterController.cs | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/asg_form/Controllers/Teamregistration/RegisterController.cs b/asg_form/Controllers/Teamregistration/RegisterController.cs index c0344ab..2f991c2 100644 --- a/asg_form/Controllers/Teamregistration/RegisterController.cs +++ b/asg_form/Controllers/Teamregistration/RegisterController.cs @@ -283,22 +283,32 @@ namespace asg_form.Controllers.Teamregistration } return Ok(new error_mb { code = 401, message = "没有管理员，无法设置" }); } - } - /// - /// 根据主键id找申请表所有内容T_Comform - /// - [Route("api/v1/admin/findFormById")] - [HttpGet] - [Authorize] - public async Task> find_by_id(int Id) - { - string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; - var user = await userManager.FindByIdAsync(userId); - if (!this.User.FindAll(ClaimTypes.Role).Any(a => a.Value == "admin")) + /// + /// 根据主键id找申请表所有内容T_Comform + /// + [Route("api/v1/admin/findFormById")] + [HttpGet] + [Authorize] + public async Task> find_by_id(int Id) { - return Ok(new error_mb { code = 401, message = "无权访问" }); + string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; + var user = await userManager.FindByIdAsync(userId); + if (!this.User.FindAll(ClaimTypes.Role).Any(a => a.Value == "admin")) + { + return Ok(new error_mb { code = 401, message = "无权访问" }); + } + using (TestDbContext sub = new TestDbContext()) + { + var query = sub.T_Comform.AsQueryable() + .Where(n => n.id == Id) + .OrderByDescending(a => a.user_id); + + var result = await query.ToListAsync(); + + return Ok(new { code = 200, data = result }); + } } - } + } From 642a067e4265332288eece34c4d0686bd3af890c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com> Date: Sun, 24 Nov 2024 22:31:33 +0800 Subject: [PATCH 3/5] 1 --- asg_form/Controllers/auditAndFilingController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asg_form/Controllers/auditAndFilingController.cs b/asg_form/Controllers/auditAndFilingController.cs index 7acbcbb..cf9ec79 100644 --- a/asg_form/Controllers/auditAndFilingController.cs +++ b/asg_form/Controllers/auditAndFilingController.cs @@ -153,7 +153,7 @@ namespace asg_form.Controllers { [Route("api/v1/admin/AuditFind")] [HttpGet] [Authorize] - public async Task> auditFind([FromQuery] string archive=null,string projName = null, string projNo = null, string bizType = null, string startPerson = null, string budgetUse = null, short page = 1, short limit = 10) + public async Task> auditFind([FromQuery] string archive,string projName, string projNo, string bizType, string startPerson, string budgetUse, short page = 1, short limit = 10) { string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; var user = await userManager.FindByIdAsync(userId); From 640f20729ea5fd1909eb106f5dfd4edc32947ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com> Date: Sun, 24 Nov 2024 22:39:50 +0800 Subject: [PATCH 4/5] 1 --- asg_form/Controllers/auditAndFilingController.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/asg_form/Controllers/auditAndFilingController.cs b/asg_form/Controllers/auditAndFilingController.cs index cf9ec79..c30facf 100644 --- a/asg_form/Controllers/auditAndFilingController.cs +++ b/asg_form/Controllers/auditAndFilingController.cs @@ -105,15 +105,12 @@ namespace asg_form.Controllers { au.reason = auditinfo.reason; au.start_person_id = auditinfo.startPersonId; au.start_person = auditinfo.startPerson; - if(auditinfo.relativeId != null) + au.node_index = auditinfo.nodeIndex; + au.flow_config = auditinfo.flowConfig; + if(!query.Any(n => n.relative_id == auditinfo.relativeId)) { - if(!query.Any(n => n.relative_id == auditinfo.relativeId)) - { - au.relative_id = auditinfo.relativeId; - } - au.node_index = auditinfo.nodeIndex; - au.flow_config = auditinfo.flowConfig; - } + au.relative_id = auditinfo.relativeId; + } sub.SaveChanges(); return Ok(new { code = 200, message = "成功修改" }); } @@ -138,6 +135,9 @@ namespace asg_form.Controllers { reason = auditinfo.reason, start_person_id = auditinfo.startPersonId, start_person = auditinfo.startPerson, + relative_id = auditinfo.relativeId, + node_index = auditinfo.nodeIndex, + flow_config = auditinfo.flowConfig, }; sub.T_Audit.Add(newAudit); From 5f52096f03e066bcdb3f8cc9566cafe46ec8cdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=82=9C=E7=BF=94?= <2307953404@qq.com> Date: Sun, 24 Nov 2024 22:54:07 +0800 Subject: [PATCH 5/5] 111 --- .../Controllers/Teamregistration/RegisterController.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/asg_form/Controllers/Teamregistration/RegisterController.cs b/asg_form/Controllers/Teamregistration/RegisterController.cs index 2f991c2..a416cd2 100644 --- a/asg_form/Controllers/Teamregistration/RegisterController.cs +++ b/asg_form/Controllers/Teamregistration/RegisterController.cs @@ -300,13 +300,9 @@ namespace asg_form.Controllers.Teamregistration } using (TestDbContext sub = new TestDbContext()) { - var query = sub.T_Comform.AsQueryable() - .Where(n => n.id == Id) - .OrderByDescending(a => a.user_id); + var query = await sub.T_Comform.FirstOrDefaultAsync(n => n.id == Id); - var result = await query.ToListAsync(); - - return Ok(new { code = 200, data = result }); + return Ok(new { code = 200, data = query }); } } }