luolan/asg_backend
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
王炜翔 2024-11-11 21:54:32 +08:00
parent b2ec2819a9
commit c91c02285d
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
asg_form/Controllers/auditAndFilingController.cs
View File

@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Security.Claims; using System.Security.Claims;
using Manganese.Array; using Manganese.Array;
using Microsoft.EntityFrameworkCore;
namespace asg_form.Controllers { namespace asg_form.Controllers {
public class FileDB public class FileDB
@ -15,8 +16,8 @@ namespace asg_form.Controllers {
public int? budget_id { get; set; } public int? budget_id { get; set; }
public string start_time { get; set; } public string start_time { get; set; }
public decimal budget_money { get; set; } public decimal budget_money { get; set; }
public int start_person_id { get; set; } public int? start_person_id { get; set; }
public string start_person { get; set; } public string? start_person { get; set; }
public string now_auth_person { get; set; } public string now_auth_person { get; set; }
public int now_auth_person_id { get; set; } public int now_auth_person_id { get; set; }
public string id { get; set; } public string id { get; set; }
@ -36,8 +37,8 @@ namespace asg_form.Controllers {
public int budgetId { get; set; } public int budgetId { get; set; }
public string startTime { get; set; } public string startTime { get; set; }
public decimal budgetMoney { get; set; } public decimal budgetMoney { get; set; }
public int startPersonId { get; set; } public int? startPersonId { get; set; }
public string startPerson { get; set; } public string? startPerson { get; set; }
public string nowAuthPerson { get; set; } public string nowAuthPerson { get; set; }
public int nowAuthPersonId { get; set; } public int nowAuthPersonId { get; set; }
public string Id { get; set; } public string Id { get; set; }
@ -94,6 +95,7 @@ namespace asg_form.Controllers {
au.description = auditinfo.description; au.description = auditinfo.description;
au.reason = auditinfo.reason; au.reason = auditinfo.reason;
au.start_person_id = auditinfo.startPersonId; au.start_person_id = auditinfo.startPersonId;
au.start_person = auditinfo.startPerson;
sub.SaveChanges(); sub.SaveChanges();
return Ok(new { code = 200, message = "成功修改" }); return Ok(new { code = 200, message = "成功修改" });
} }
@ -117,6 +119,7 @@ namespace asg_form.Controllers {
description = auditinfo.description, description = auditinfo.description,
reason = auditinfo.reason, reason = auditinfo.reason,
start_person_id = auditinfo.startPersonId, start_person_id = auditinfo.startPersonId,
start_person = auditinfo.startPerson,
}; };
sub.T_Audit.Add(newAudit); sub.T_Audit.Add(newAudit);
@ -132,7 +135,7 @@ namespace asg_form.Controllers {
[Route("api/v1/admin/AuditFind")] [Route("api/v1/admin/AuditFind")]
[HttpGet] [HttpGet]
[Authorize] [Authorize]
public async Task<ActionResult<object>> auditFind([FromQuery] string archive="",string projName = "", string projNo = "", string bizType = "", string startPerson = "", string budgetUse = "", short page = 1, short limit = 10) public async Task<ActionResult<object>> 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)
{ {
string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value;
var user = await userManager.FindByIdAsync(userId); var user = await userManager.FindByIdAsync(userId);
@ -143,39 +146,39 @@ namespace asg_form.Controllers {
} }
using (TestDbContext sub = new TestDbContext()) using (TestDbContext sub = new TestDbContext())
{ {
try
{
var query = sub.T_Audit var query = sub.T_Audit
.Where(n => n.proj_name.Contains(projName) || n.proj_no.Contains(projNo) || n.biz_type.Contains(bizType) || n.start_person.Contains(startPerson) || n.budget_use.Contains(budgetUse)).AsQueryable(); .Where(n => (n.proj_name.Contains(projName)||projName==null) && (n.proj_no.Contains(projNo) || projNo == null) && (n.biz_type.Contains(bizType) || bizType == null) && (n.start_person.Contains(startPerson)|| startPerson == null) && (n.budget_use.Contains(budgetUse)|| budgetUse == null))
.AsQueryable();
try
{
if (archive == "1") if (archive == "1")
{ {
var rows = query var rows = await query
.Skip((page - 1) * limit) .Skip((page - 1) * limit)
.Take(limit) .Take(limit)
.ToList(); .ToListAsync();
int total = query.Count(); int total = await query.CountAsync();
var data = new var data = new
{ {
rows, rows,
total, total,
}; };
return Ok(new { code = 200, message = "", data }); return Ok(new { code = 200, message = "", data , archive });
} }
else else
{ {
var rows = query var rows =await query
.Where(n =>n.now_auth_person_id ==(int)user.Id) .Where(n => n.now_auth_person_id ==(int)user.Id )
.Skip((page - 1) * limit) .Skip((page - 1) * limit)
.Take(limit) .Take(limit)
.ToList(); .ToListAsync();
int total = query.Count(); int total = await query.Where(n => n.now_auth_person_id == (int)user.Id).CountAsync();
var data = new var data = new
{ {
rows, rows,
total, total,
}; };
return Ok(new { code = 200, message = "", data }); return Ok(new { code = 200, message = "", data , archive });
} }
} }
catch (Exception ex) catch (Exception ex)

5
asg_form/Controllers/schedule.cs
View File

@ -383,12 +383,13 @@ namespace asg_form.Controllers
string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value;
TestDbContext test = new TestDbContext(); TestDbContext test = new TestDbContext();
var team = test.schlogs.Include(a=>a.team).Where(a=>a.userid==id).ToList(); var team = test.schlogs.Include(a=>a.team).Where(a=>a.userid==id).Take(5).ToList();
foreach(var team_game in team) foreach(var team_game in team)
{ {
team_game.team.logs = null; team_game.team.logs = null;
} }
return team;
return team ;
} }