1111

2026-08-27 16:27:08 +08:00
parent ae8167a566
commit 80940c60a5
22 changed files with 218 additions and 8 deletions
@@ -103,6 +103,11 @@ public class OnboardingTaskContractVariableItemOutput
    /// </summary>
    public string DataType { get; set; }

+    /// <summary>
+    /// 任务创建时保存的变量展示顺序。
+    /// </summary>
+    public int SortCode { get; set; }
+
    /// <summary>
    /// 任务合同变量最终值。
    /// </summary>
@@ -43,7 +43,8 @@ public class OnboardingTaskContractVariableService : IOnboardingTaskContractVari

            Variables = variables
                .Where(variable => variable.TaskContractId == contract.Id)
-                .OrderBy(variable => variable.VariableCode)
+                .OrderBy(variable => variable.SortCode)
+                .ThenBy(variable => variable.VariableCode)
                .Select(variable =>
                {
                    var definition = definitions.FirstOrDefault(x =>
@@ -59,6 +60,7 @@ public class OnboardingTaskContractVariableService : IOnboardingTaskContractVari
                        VariableName = variable.VariableName,
                        VariableType = variable.VariableType,
                        DataType = variable.DataType,
+                        SortCode = variable.SortCode,
                        VariableValue = variable.VariableValue,
                        Required = definition?.Required == true,
                        HrEditable = hrEditable,