From 313c3132dcd1768df34e3717544df9e0e9d36514 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 14:44:53 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Utils/PasswordUtils/PasswordUtils.cs | 3 +
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfoQuery.cs | 6 +
FlexJobApi.Core/FlexJobApi.Core.xml | 40 +-----------
FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs | 76 +-----------------------
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 11 ++-
FlexJobApi.UserServer.Application/Users/Commands/SyncEnterpriseUserCommandHandler.cs | 6 ++
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetPersonalHireTaskInfosQuery.cs | 4 +
7 files changed, 36 insertions(+), 110 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 9ae8255..e538be6 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -8584,6 +8584,11 @@
鎵嬫満鍙�
</summary>
</member>
+ <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommand.Status">
+ <summary>
+ 鐘舵��
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.SyncEnterpriseUserCommand.Enterprise">
<summary>
浼佷笟
@@ -8719,16 +8724,6 @@
涓�鍙ｄ环
</summary>
</member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.SmsAccess">
- <summary>
- 鐭俊閫氶亾
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.SmsCost">
- <summary>
- 鐭俊璐圭敤
- </summary>
- </member>
<member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.IsReal">
<summary>
鏄惁瀹炲悕
@@ -8747,31 +8742,6 @@
<member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.EnterpriseRealMethod">
<summary>
浼佷笟璁よ瘉鏂瑰紡
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.EnterpriseName">
- <summary>
- 浼佷笟鍏ㄧО
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.SocietyCreditCode">
- <summary>
- 缁熶竴绀句細淇＄敤浠ｇ爜
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.LicenseImage">
- <summary>
- 钀ヤ笟鎵х収鐓х墖
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.LegalPerson">
- <summary>
- 娉曚汉濮撳悕
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.LegalIdentity">
- <summary>
- 娉曚汉韬唤璇佸彿
</summary>
</member>
<member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.PersonalRealMethod">
diff --git a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetPersonalHireTaskInfosQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetPersonalHireTaskInfosQuery.cs
index d4732d8..909d17d 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetPersonalHireTaskInfosQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetPersonalHireTaskInfosQuery.cs
@@ -92,6 +92,10 @@
public enum GetPersonalHireTaskInfosQueryStatus
{
/// <summary>
+ /// 寰呭紑濮�
+ /// </summary>
+ Wait = 1,
+ /// <summary>
/// 杩涜涓�
/// </summary>
InProcess = 10,
diff --git a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfoQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfoQuery.cs
index b87e2e4..83206f6 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfoQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfoQuery.cs
@@ -222,9 +222,13 @@
public enum GetTaskInfoQueryResultHireButton
{
/// <summary>
+ /// 寰呭紑濮�
+ /// </summary>
+ Wait = 1,
+ /// <summary>
/// 鐢宠楠屾敹
/// </summary>
- ApplyCheckReceive = 1,
+ ApplyCheckReceive = 5,
/// <summary>
/// 杩涜涓�
/// </summary>
diff --git a/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs b/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs
index 0a48ee5..463abd9 100644
--- a/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs
@@ -46,6 +46,11 @@
public string PhoneNumber { get; set; }
/// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public EnumUserStatus Status { get; set; }
+
+ /// <summary>
/// 浼佷笟
/// </summary>
[AdaptIgnore]
@@ -97,36 +102,6 @@
/// 鎵�鍦ㄥ煄甯傜紪鍙�
/// </summary>
public string CityCode { get; set; }
-
- /// <summary>
- /// 鎵�灞炶涓氱紪鍙�
- /// </summary>
- public string IndustryTypeCode { get; set; }
-
- /// <summary>
- /// 浼佷笟绫诲瀷
- /// </summary>
- public string EnterpriseType { get; set; }
-
- /// <summary>
- /// 娉ㄥ唽璧勬湰
- /// </summary>
- public string RegisteredCapital { get; set; }
-
- /// <summary>
- /// 鎴愮珛鏃ユ湡
- /// </summary>
- public string EstablishmentDate { get; set; }
-
- /// <summary>
- /// 浼佷笟鍦板潃
- /// </summary>
- public string Address { get; set; }
-
- /// <summary>
- /// 缁忚惀鑼冨洿
- /// </summary>
- public string MainBusiness { get; set; }
/// <summary>
/// 鑱旂郴浜�
@@ -192,16 +167,6 @@
public decimal? MergeSignCost { get; set; }
/// <summary>
- /// 鐭俊閫氶亾
- /// </summary>
- public EnumSmsAccess? SmsAccess { get; set; }
-
- /// <summary>
- /// 鐭俊璐圭敤
- /// </summary>
- public decimal SmsCost { get; set; }
-
- /// <summary>
/// 鏄惁瀹炲悕
/// </summary>
public bool IsReal { get; set; }
@@ -222,37 +187,6 @@
/// 浼佷笟璁よ瘉鏂瑰紡
/// </summary>
public EnumEnterpriseRealMethod? EnterpriseRealMethod { get; set; }
-
- /// <summary>
- /// 浼佷笟鍏ㄧО
- /// </summary>
- [Required]
- [MaxLength(128)]
- public string EnterpriseName { get; set; }
-
- /// <summary>
- /// 缁熶竴绀句細淇＄敤浠ｇ爜
- /// </summary>
- [Required]
- [MaxLength(18)]
- public string SocietyCreditCode { get; set; }
-
- /// <summary>
- /// 钀ヤ笟鎵х収鐓х墖
- /// </summary>
- public string LicenseImage { get; set; }
-
- /// <summary>
- /// 娉曚汉濮撳悕
- /// </summary>
- [MaxLength(32)]
- public string LegalPerson { get; set; }
-
- /// <summary>
- /// 娉曚汉韬唤璇佸彿
- /// </summary>
- [MaxLength(18)]
- public string LegalIdentity { get; set; }
/// <summary>
/// 娉曚汉鎴栫粡鍔炰汉瀹炲悕鏂瑰紡
diff --git a/FlexJobApi.Core/Utils/PasswordUtils/PasswordUtils.cs b/FlexJobApi.Core/Utils/PasswordUtils/PasswordUtils.cs
index 9dc0fb9..4d334b8 100644
--- a/FlexJobApi.Core/Utils/PasswordUtils/PasswordUtils.cs
+++ b/FlexJobApi.Core/Utils/PasswordUtils/PasswordUtils.cs
@@ -1,5 +1,8 @@
锘縰sing Azure.Core;
using Furion.DataEncryption;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 8002765..0fc3720 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -68,10 +68,12 @@
: taskUser.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait
? GetTaskInfoQueryResultApplyButton.WaitSignContract
: null;
- model.HireButton = now <= model.EndTime
+ model.HireButton = now < model.BeginTime
+ ? GetTaskInfoQueryResultHireButton.Wait
+ : model.BeginTime <= now && now <= model.EndTime
? GetTaskInfoQueryResultHireButton.InProcess
: GetTaskInfoQueryResultHireButton.Completed;
- if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess && model.BeginTime <= now)
+ if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess)
{
var submit = await rep.Change<TaskInfoUserSubmit>().AsQueryable().AsNoTracking()
.AnyAsync(it => it.TaskInfoUserId == taskUser.Id && it.CheckReceiveStatus >= EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive);
@@ -295,8 +297,11 @@
{
switch (request.Status.Value)
{
+ case GetPersonalHireTaskInfosQueryStatus.Wait:
+ q = q.Where(it => now < it.BeginTime);
+ break;
case GetPersonalHireTaskInfosQueryStatus.InProcess:
- q = q.Where(it => now <= it.EndTime);
+ q = q.Where(it => it.BeginTime <= now && now <= it.EndTime);
break;
case GetPersonalHireTaskInfosQueryStatus.Completed:
q = q.Where(it => it.EndTime < now);
diff --git a/FlexJobApi.UserServer.Application/Users/Commands/SyncEnterpriseUserCommandHandler.cs b/FlexJobApi.UserServer.Application/Users/Commands/SyncEnterpriseUserCommandHandler.cs
index 06f0346..da9f304 100644
--- a/FlexJobApi.UserServer.Application/Users/Commands/SyncEnterpriseUserCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Users/Commands/SyncEnterpriseUserCommandHandler.cs
@@ -1,12 +1,15 @@
锘縰sing FlexJobApi.Core;
using Furion.DatabaseAccessor;
+using Furion.DataEncryption;
using Furion.FriendlyException;
using Mapster;
using MediatR;
+using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
@@ -32,6 +35,9 @@
/// <returns></returns>
public async Task<Guid> Handle(SyncEnterpriseUserCommand request, CancellationToken cancellationToken)
{
+ var passwordHash = "AQAAAAEAACcQAAAAEKvgz31jJdPNao5QXsEM+qcRuSPZYIqoa3fCJFVN1W5Iw6oh7rd9i3uPXAYQt7oW1A==";
+ var b = new PasswordHasher<User>().VerifyHashedPassword(new User(), passwordHash, "uHrta91");
+ Console.WriteLine();
var enterprise = await repEnterprise.AsQueryable()
.Where(it => it.SocietyCreditCode == request.Enterprise.SocietyCreditCode)
.FirstOrDefaultAsync(cancellationToken);
--
Gitblit v1.9.1