Commit ecba3c29 authored by 黄奎's avatar 黄奎

页面修改

parent ebc4cd93
...@@ -14,5 +14,10 @@ namespace Edu.Model.ViewModel.Customer ...@@ -14,5 +14,10 @@ namespace Edu.Model.ViewModel.Customer
/// 任务编号【逗号分割】 /// 任务编号【逗号分割】
/// </summary> /// </summary>
public string QTaskIds { get; set; } public string QTaskIds { get; set; }
/// <summary>
/// 关联目标名称
/// </summary>
public string TargetName { get; set; }
} }
} }
...@@ -21,8 +21,8 @@ namespace Edu.Repository.Customer ...@@ -21,8 +21,8 @@ namespace Edu.Repository.Customer
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* SELECT A.*,IFNULL(B.CourseName,'') AS TargetName
FROM RB_Customer_TaskDetails FROM RB_Customer_TaskDetails AS A LEFT JOIN rb_course AS B ON (A.TargetId=B.CourseId AND A.TaskType=1)
WHERE 1=1 WHERE 1=1
"); ");
if (query != null) if (query != null)
......
...@@ -28,7 +28,7 @@ namespace Edu.Repository.Customer ...@@ -28,7 +28,7 @@ namespace Edu.Repository.Customer
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* SELECT A.*
FROM RB_Customer_Task FROM RB_Customer_Task AS A
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Task_Extend.Status), (int)DateStateEnum.Normal); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Task_Extend.Status), (int)DateStateEnum.Normal);
...@@ -44,7 +44,7 @@ WHERE 1=1 ...@@ -44,7 +44,7 @@ WHERE 1=1
parameters.Add("TaskName", "%" + query.TaskName.Trim() + "%"); parameters.Add("TaskName", "%" + query.TaskName.Trim() + "%");
} }
} }
return GetPage<RB_Customer_Task_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList(); return GetPage<RB_Customer_Task_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment