From ad63bd48b1619e7c3779eefdf1d6a32a222169da Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 09 九月 2025 09:33:19 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.FlexJobServer.Application/TaskUsers/Commands/TaskUserCommandHandler.cs |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Commands/TaskUserCommandHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Commands/TaskUserCommandHandler.cs
index 7dfa454..641eb79 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Commands/TaskUserCommandHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Commands/TaskUserCommandHandler.cs
@@ -19,6 +19,7 @@
             IRepository<TaskUserCollect> repTaskUserCollect
         ) :
         IRequestHandler<CollectTaskCommand, int>,
+        IRequestHandler<ClearTaskCollectCommand, int>,
         IRequestHandler<SetTaskUserHireCommand, Guid>,
         IRequestHandler<SetTaskUserArrangeCommand, Guid>
     {
@@ -59,6 +60,28 @@
         }
 
         /// <summary>
+        /// 娓呯┖宸插仠姝㈢殑浠诲姟鏀惰棌
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        public async Task<int> Handle(ClearTaskCollectCommand request, CancellationToken cancellationToken)
+        {
+            var logier = JwtUtils.GetCurrentLogier();
+            var entities = await repTaskUserCollect.AsQueryable()
+                .Where(it => it.TaskInfo.ReleaseStatus == EnumTaskReleaseStatus.Stopped && it.UserId == logier.Id)
+                .ToListAsync(cancellationToken);
+            if (entities.IsNotNull())
+            {
+                foreach (var entity in entities)
+                {
+                    await repTaskUserCollect.DeleteAsync(entity);
+                }
+            }
+            return entities.Count;
+        }
+
+        /// <summary>
         /// 浠诲姟褰曠敤
         /// </summary>
         /// <param name="request"></param>
@@ -73,18 +96,16 @@
                     it.TaskInfo.EnterpriseId == logier.EnterpriseId
                     && it.Id == request.Id)
                 .FirstOrDefaultAsync(cancellationToken);
-            if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ユ姤鍚嶄俊鎭�");
-            if (entity.HireStatus == EnumTaskUserHireStatus.Pass) throw Oops.Oh(EnumErrorCodeType.s510, "璇ョ伒宸ュ凡褰曠敤");
+            if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "鎶ュ悕淇℃伅");
+            if (entity.HireStatus == EnumTaskUserHireStatus.Pass) throw Oops.Oh(EnumErrorCodeType.s510, "鐏靛伐宸插綍鐢�");
             entity.HireStatus = request.HireStatus;
             if (entity.HireStatus == EnumTaskUserHireStatus.Pass)
             {
-                entity.EnterpriseEmployee.UserSignContractStatus = EnumTaskUserSignContractStatus.Pass;
-                entity.EnterpriseEmployee.UserSignContractTime = DateTime.Now;
-                entity.EnterpriseEmployee.EnterpriseSignContractStatus = EnumTaskUserSignContractStatus.Pass;
-                entity.EnterpriseEmployee.EnterpriseSignContractTime = DateTime.Now;
-
                 entity.HireTime = DateTime.Now;
-                entity.ArrangeStatus = EnumTaskUserArrangeStatus.Wait;
+                if (entity.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass)
+                {
+                    entity.ArrangeStatus = EnumTaskUserArrangeStatus.Wait;
+                }
             }
             await rep.UpdateAsync(entity);
             return entity.Id;
@@ -106,8 +127,9 @@
                     it.TaskInfo.EnterpriseId == logier.EnterpriseId
                     && it.Id == request.Id)
                 .FirstOrDefaultAsync(cancellationToken);
-            if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ユ姤鍚嶄俊鎭�");
-            if (entity.ArrangeStatus == EnumTaskUserArrangeStatus.Complete) throw Oops.Oh(EnumErrorCodeType.s510, "璇ョ伒宸ュ凡瀹夋帓");
+            if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "鎶ュ悕淇℃伅");
+            if (entity.EnterpriseEmployee.EnterpriseSignContractStatus != EnumTaskUserSignContractStatus.Pass) throw Oops.Oh(EnumErrorCodeType.s510, "鐏靛伐鏈绾�");
+            if (entity.ArrangeStatus == EnumTaskUserArrangeStatus.Complete) throw Oops.Oh(EnumErrorCodeType.s510, "鐏靛伐宸插畨鎺�");
             entity.ArrangeStatus = request.ArrangeStatus;
             if (entity.ArrangeStatus == EnumTaskUserArrangeStatus.Complete)
             {

--
Gitblit v1.9.1