From 5f935374836ec8b89c209eae174eb3f2f3d4eca5 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 29 八月 2025 09:20:01 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 1
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs | 5 ++
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs | 5 ++
FlexJobApi.Core/FlexJobApi.Core.xml | 10 +++++
FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/StopElectronSignCommand.cs | 21 ++++++++++
FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml | 8 ++++
FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs | 32 +++++++++++++++
7 files changed, 81 insertions(+), 1 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index ca3a01d..10c11d2 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -8534,6 +8534,16 @@
绛剧讲鍚堝悓闀块摼鎺�
</summary>
</member>
+ <member name="T:FlexJobApi.Core.StopElectronSignCommand">
+ <summary>
+ 鐏靛伐瑙ｇ害
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.StopElectronSignCommand.Id">
+ <summary>
+ 鐏靛伐Id
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.GetEnterpriseEmployeeQuery">
<summary>
鏌ヨ鐏靛伐璇︽儏
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs
index dbc203f..ec7efcd 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs
@@ -52,6 +52,11 @@
public GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser TaskInfoUserEnterpriseEmployeeUser { get; set; }
/// <summary>
+ /// 楠屾敹鏃堕棿
+ /// </summary>
+ public DateTime Date { get; set; }
+
+ /// <summary>
/// 鎻愪氦鏃堕棿
/// </summary>
public DateTimeOffset CreatedTime { get; set; }
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs
index 7193cee..b04ce3a 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitsQuery.cs
@@ -152,6 +152,11 @@
public Guid Id { get; set; }
/// <summary>
+ /// 楠屾敹鏃堕棿
+ /// </summary>
+ public DateTime Date { get; set; }
+
+ /// <summary>
/// 鎻愪氦鏃堕棿
/// </summary>
public DateTimeOffset CreatedTime { get; set; }
diff --git a/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/StopElectronSignCommand.cs b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/StopElectronSignCommand.cs
new file mode 100644
index 0000000..93f5a3c
--- /dev/null
+++ b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/StopElectronSignCommand.cs
@@ -0,0 +1,21 @@
+锘縰sing MediatR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlexJobApi.Core
+{
+ /// <summary>
+ /// 鐏靛伐瑙ｇ害
+ /// </summary>
+ [Resource([EnumResourceController.UserServerEnterpriseEmployee])]
+ public class StopElectronSignCommand : IRequest<Guid>
+ {
+ /// <summary>
+ /// 鐏靛伐Id
+ /// </summary>
+ public Guid Id { get; set; }
+ }
+}
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 2c81f53..32fea4c 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -220,6 +220,7 @@
var s = q.Select(it => new GetCheckReceiveTaskUserSubmitsQueryResultItem
{
Id = it.Id,
+ Date = it.Date,
CreatedTime = it.CreatedTime,
Files = it.Files.Select(f => f.File).ToList(),
CheckReceiveStatus = it.CheckReceiveStatus,
diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
index fe173ab..ecd94d1 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
@@ -43,7 +43,8 @@
IRequestHandler<EditEnterpriseEmployeeCommand, Guid>,
IRequestHandler<InviteElectronSignCommand, Guid>,
IRequestHandler<PersonalUserElectronSignCommand, PersonalUserElectronSignCommandResult>,
- IRequestHandler<EnterpriseUserElectronSignCommand, EnterpriseUserElectronSignCommandResult>
+ IRequestHandler<EnterpriseUserElectronSignCommand, EnterpriseUserElectronSignCommandResult>,
+ IRequestHandler<StopElectronSignCommand, Guid>
{
private readonly IMediator mediator = mediator;
private readonly IRepository<EnterpriseEmployee> rep = rep;
@@ -378,5 +379,34 @@
}
return result.Result.Adapt<EnterpriseUserElectronSignCommandResult>();
}
+
+ /// <summary>
+ /// 鐏靛伐瑙ｇ害
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<Guid> Handle(StopElectronSignCommand request, CancellationToken cancellationToken)
+ {
+ var logier = JwtUtils.GetCurrentLogier();
+ var entity = await rep.AsQueryable()
+ .Where(it => it.EnterpriseId == logier.EnterpriseId && it.Id == request.Id)
+ .FirstOrDefaultAsync();
+ if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "鐏靛伐");
+ if (entity.UserSignContractStatus != EnumTaskUserSignContractStatus.Effect) throw Oops.Oh(EnumErrorCodeType.s400, "鏈敓鏁�");
+ entity.UserSignContractStatus = EnumTaskUserSignContractStatus.Stop;
+ entity.EnterpriseSignContractStatus = EnumTaskUserSignContractStatus.Stop;
+ await rep.UpdateAsync(entity);
+
+ var contract = await repEnterpriseEmployeeContract.AsQueryable()
+ .OrderByDescending(it => it.CreatedTime)
+ .Where(it => it.EnterpriseEmployeeId == entity.Id)
+ .FirstOrDefaultAsync();
+ if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "鍚堝悓");
+ contract.UserSignContractStatus = EnumTaskUserSignContractStatus.Stop;
+ contract.EnterpriseSignContractStatus = EnumTaskUserSignContractStatus.Stop;
+ await repEnterpriseEmployeeContract.UpdateAsync(contract);
+ return entity.Id;
+ }
}
}
diff --git a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
index 783bc10..e23b688 100644
--- a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
+++ b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
@@ -419,6 +419,14 @@
<param name="cancellationToken"></param>
<returns></returns>
</member>
+ <member name="M:FlexJobApi.UserServer.Application.EnterpriseEmployeesCommandHandler.Handle(FlexJobApi.Core.StopElectronSignCommand,System.Threading.CancellationToken)">
+ <summary>
+ 鐏靛伐瑙ｇ害
+ </summary>
+ <param name="request"></param>
+ <param name="cancellationToken"></param>
+ <returns></returns>
+ </member>
<member name="T:FlexJobApi.UserServer.Application.EnterpriseEmployeeQueryHandler">
<summary>
鐏靛伐鏌ヨ澶勭悊鍣�
--
Gitblit v1.9.1