From 20ad0ae660e2669b4428c9b97f0cd5d48044d836 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 11 七月 2024 07:52:26 +0800
Subject: [PATCH] Merge branch 'hwh'
---
Wms/WMS.BLL/LogServer/OperationCrServer.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/LogServer/OperationCrServer.cs b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
index 8423c4d..253df18 100644
--- a/Wms/WMS.BLL/LogServer/OperationCrServer.cs
+++ b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
@@ -2,8 +2,12 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
using Model.ModelDto.LogDto;
+using Model.ModelVm.LogVm;
using SqlSugar;
+using Utility;
using WMS.DAL;
using WMS.Entity.Context;
using WMS.Entity.LogEntity;
@@ -15,8 +19,13 @@
public class OperationCrServer: DbHelper<LogOperationCR>,IOperationCRServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
+ private readonly UserManager _userManager;
public OperationCrServer() : base(Db)
{
+ }
+ public OperationCrServer(UserManager userManager) : base(Db)
+ {
+ _userManager = userManager;
}
public List<OperationDto> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, out int count)
{
@@ -61,9 +70,8 @@
{
try
{
- var contextDb = DataContext.Db;
- var menu = contextDb.Queryable<SysFunctionMenu>().Where(m => m.IsDel == "0").ToList();
- var dic = contextDb.Queryable<SysDictionary>().Where(m => m.ParentNo == "LogType" && m.IsDel == "0").ToList();
+ var menu = Db.Queryable<SysFunctionMenu>().Where(m => m.IsDel == "0").ToList();
+ var dic = Db.Queryable<SysDictionary>().Where(m => m.ParentNo == "LogType" && m.IsDel == "0").ToList();
var typeId = dic.FirstOrDefault(m => m.DictName == type);
var n = Add(new LogOperationCR()
@@ -85,5 +93,18 @@
throw new Exception(e.Message);
}
}
+ /// <summary>
+ /// 鏂板绯荤粺鎿嶄綔鏃ュ織
+ /// </summary>
+ /// <returns></returns>
+ public async Task<int> AddLogOperationCr(OperationInputVm input)
+ {
+ input.ParentNo = (await Db.Queryable<SysFunctionMenu>().FirstAsync(s => s.MenuName == input.ParentName && s.IsDel == "0"))?.MenuNo;
+ input.MenuNo = (await Db.Queryable<SysFunctionMenu>().FirstAsync(s => s.MenuName == input.MenuName && s.IsDel == "0"))?.MenuNo;
+ input.Type = (await Db.Queryable<SysDictionary>().FirstAsync(s => s.DictName == input.TypeName && s.IsDel == "0"))?.Id.ToString();
+ input.CreateUser = _userManager.UserId;
+ input.CreateTime = DateTime.Now;
+ return await Db.Insertable<LogOperationSys>(input).ExecuteCommandAsync();
+ }
}
}
--
Gitblit v1.8.0