From 509f2b5d3ee9208ea6b86aae5d29194c654d67f5 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 06 八月 2025 16:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs b/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs
index 0f82192..4a7af33 100644
--- a/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs
+++ b/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs
@@ -1,4 +1,5 @@
-锘縰sing MediatR;
+锘縰sing Mapster;
+using MediatR;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -9,15 +10,20 @@
namespace FlexJobApi.Core
{
/// <summary>
- /// 鑾峰彇瀛楀吀鏁版嵁鍒嗛〉鍒楄〃
+ /// 鑾峰彇鏁版嵁瀛楀吀鍒嗛〉鍒楄〃鏁版嵁
/// </summary>
[Resource([EnumResourceController.Dictionary])]
- public class GetDictionaryDatasQuery : PagedListQuery<PagedListQueryResult<GetDictionaryDatasQueryResultItem>, GetDictionaryDatasQueryResultItem> , IRequest<PagedListQueryResult<GetDictionaryDatasQueryResultItem>>
+ public class GetDictionaryDatasQuery : PagedListQuery<PagedListQueryResult<GetDictionaryDatasQueryResultItem>, GetDictionaryDatasQueryResultItem>
{
/// <summary>
- /// 绫诲埆Id
+ /// 绫诲埆Id锛圛d/缂栧彿浜岄�変竴锛�
/// </summary>
- public Guid CategoryId { get; set; }
+ public Guid? CategoryId { get; set; }
+
+ /// <summary>
+ /// 绫诲埆缂栧彿锛圛d/缂栧彿浜岄�変竴锛�
+ /// </summary>
+ public string CategoryCode { get; set; }
/// <summary>
/// 鍏抽敭瀛�
@@ -26,7 +32,7 @@
}
/// <summary>
- /// 鑾峰彇瀛楀吀鏁版嵁鍒嗛〉鍒楄〃-缁撴灉-琛屾暟鎹�
+ /// 鑾峰彇鏁版嵁瀛楀吀鍒嗛〉鍒楄〃鏁版嵁-缁撴灉-琛屾暟鎹�
/// </summary>
public class GetDictionaryDatasQueryResultItem
{
@@ -39,6 +45,23 @@
/// 绫诲埆Id
/// </summary>
public Guid CategoryId { get; set; }
+
+ /// <summary>
+ /// 绫诲埆缂栧彿
+ /// </summary>
+ [AdaptIgnore]
+ public string CategoryCode => Category?.Code;
+
+ /// <summary>
+ /// 绫诲埆鍚嶇О
+ /// </summary>
+ [AdaptIgnore]
+ public string CategoryName => Category?.Name;
+
+ /// <summary>
+ /// 绫诲埆
+ /// </summary>
+ public GetDictionaryDatasQueryResultItemCategory Category { get; set; }
/// <summary>
/// 涓婄骇Id
@@ -92,4 +115,20 @@
/// </summary>
public bool IsDisabled { get; set; }
}
+
+ /// <summary>
+ /// 鑾峰彇鏁版嵁瀛楀吀鍒嗛〉鍒楄〃鏁版嵁-缁撴灉-琛屾暟鎹�-绫诲埆
+ /// </summary>
+ public class GetDictionaryDatasQueryResultItemCategory
+ {
+ /// <summary>
+ /// 绫诲埆缂栧彿
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+ }
}
--
Gitblit v1.9.1