Commit df3d9857 authored by 黄奎's avatar 黄奎

页面修改

parent 9f882e8c
......@@ -10,6 +10,9 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary>
public class RB_Education_Receipt_ViewModel : RB_Education_Receipt
{
/// <summary>
/// 是否特殊节点
/// </summary>
public int SpecialNode { get; set; }
}
}
......@@ -106,6 +106,8 @@ namespace Edu.Module.EduTask
item.Title,
item.ReceiptType,
DataObj,
item.SpecialNode,
item.RelationId,
ReceiptTypeName = item.ReceiptType.ToName(),
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName,
CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
......
......@@ -59,12 +59,17 @@ namespace Edu.Repository.EduTask
public List<RB_Education_Receipt_ViewModel> GetEducationReceiptPageRepository(int pageIndex, int pageSize, out long rowsCount, EducationReceiptQuery query)
{
var parameters = new DynamicParameters();
string isSpecNode = "";
if (query.Conditon == Common.Enum.Course.EduReceiptConditionEnum.WaitAgree)
{
isSpecNode = string.Format(",IFNULL((SELECT SpecialNode FROM rb_Education_relevance WHERE Id IN(SELECT BackrelevanceId FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0})),0) AS SpecialNode ", query.CreateBy);
}
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
SELECT A.* {0}
FROM RB_Education_Receipt AS A
WHERE 1=1
");
",isSpecNode);
if (query != null)
{
if (query.Group_Id > 0)
......
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