修改合并冲突

This commit is contained in:
Mac mini git server 2024-04-17 12:00:53 +08:00
parent 502342b15f
commit 12e16e0c6c
10 changed files with 11 additions and 111 deletions

View File

@ -1,14 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
@ -23,11 +19,7 @@ namespace HHWMS.Web
}
<<<<<<< HEAD
/// <summary>
=======
/// <summary>
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
/// Class to define batch edit fields
/// </summary>
public class InterfaceLog_BatchEdit : BaseVM

View File

@ -1,14 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
@ -16,11 +12,7 @@ namespace HHWMS.Web
public partial class InterfaceLogTemplateVM : BaseTemplateVM
{
<<<<<<< HEAD
protected override void InitVM()
=======
protected override void InitVM()
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
{
}

View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@ -6,11 +6,6 @@ using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
{
@ -54,7 +49,6 @@ namespace HHWMS.Web
public override IOrderedQueryable<InterfaceLog_View> GetSearchQuery()
{
var query = DC.Set<InterfaceLog>()
<<<<<<< HEAD
.CheckContain(Searcher.ModuleName, x=>x.ModuleName)
.CheckContain(Searcher.ActionName, x=>x.ActionName)
.CheckContain(Searcher.ITCode, x=>x.ITCode)
@ -67,20 +61,6 @@ namespace HHWMS.Web
.Select(x => new InterfaceLog_View
{
ID = x.ID,
=======
.CheckContain(Searcher.ModuleName, x => x.ModuleName)
.CheckContain(Searcher.ActionName, x => x.ActionName)
.CheckContain(Searcher.ITCode, x => x.ITCode)
.CheckContain(Searcher.ActionUrl, x => x.ActionUrl)
.CheckBetween(Searcher.ActionTime?.GetStartTime(), Searcher.ActionTime?.GetEndTime(), x => x.ActionTime, includeMax: false)
.CheckContain(Searcher.IP, x => x.IP)
.CheckEqual(Searcher.LogType, x => x.LogType)
.CheckContain(Searcher.Request, x => x.Request)
.CheckContain(Searcher.Result, x => x.Result)
.Select(x => new InterfaceLog_View
{
ID = x.ID,
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
ModuleName = x.ModuleName,
ActionName = x.ActionName,
ITCode = x.ITCode,
@ -100,12 +80,9 @@ namespace HHWMS.Web
}
<<<<<<< HEAD
public class InterfaceLog_View : InterfaceLog{
=======
public class InterfaceLog_View : InterfaceLog
{
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
}
}

View File

@ -1,14 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web

View File

@ -1,14 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
@ -25,11 +21,7 @@ namespace HHWMS.Web
}
public override void DoAdd()
<<<<<<< HEAD
{
=======
{
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
base.DoAdd();
}

View File

@ -1,14 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
@ -23,11 +19,7 @@ namespace HHWMS.Web
}
<<<<<<< HEAD
/// <summary>
=======
/// <summary>
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
/// Class to define batch edit fields
/// </summary>
public class JobLog_BatchEdit : BaseVM

View File

@ -1,26 +1,17 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
{
public partial class JobLogTemplateVM : BaseTemplateVM
{
<<<<<<< HEAD
protected override void InitVM()
=======
protected override void InitVM()
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
{
}

View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@ -6,10 +6,6 @@ using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
@ -54,7 +50,6 @@ namespace HHWMS.Web
public override IOrderedQueryable<JobLog_View> GetSearchQuery()
{
var query = DC.Set<JobLog>()
<<<<<<< HEAD
.CheckContain(Searcher.ModuleName, x=>x.ModuleName)
.CheckContain(Searcher.ActionName, x=>x.ActionName)
.CheckContain(Searcher.ITCode, x=>x.ITCode)
@ -63,16 +58,6 @@ namespace HHWMS.Web
.Select(x => new JobLog_View
{
ID = x.ID,
=======
.CheckContain(Searcher.ModuleName, x => x.ModuleName)
.CheckContain(Searcher.ActionName, x => x.ActionName)
.CheckContain(Searcher.ITCode, x => x.ITCode)
.CheckContain(Searcher.ActionUrl, x => x.ActionUrl)
.CheckBetween(Searcher.ActionTime?.GetStartTime(), Searcher.ActionTime?.GetEndTime(), x => x.ActionTime, includeMax: false)
.Select(x => new JobLog_View
{
ID = x.ID,
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
ModuleName = x.ModuleName,
ActionName = x.ActionName,
ITCode = x.ITCode,
@ -92,12 +77,8 @@ namespace HHWMS.Web
}
<<<<<<< HEAD
public class JobLog_View : JobLog{
=======
public class JobLog_View : JobLog
{
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
}
}

View File

@ -1,15 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
{

View File

@ -1,14 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
@ -25,11 +21,7 @@ namespace HHWMS.Web
}
public override void DoAdd()
<<<<<<< HEAD
{
=======
{
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
base.DoAdd();
}