Commit 7cceffee authored by 黄奎's avatar 黄奎

页面修改

parent 58294349
......@@ -114,9 +114,11 @@ WHERE 1=1
/// <returns></returns>
public int CheckStudentMakeUpExistsRepository(RB_Student_Makeup model)
{
List<WhereHelper> whereHelpers = new List<WhereHelper>();
whereHelpers.Add(new WhereHelper(nameof(RB_Student_Makeup.ClassCheckId), model.ClassCheckId));
whereHelpers.Add(new WhereHelper(nameof(RB_Student_Makeup.OrderGuestId), model.OrderGuestId));
List<WhereHelper> whereHelpers = new List<WhereHelper>
{
new WhereHelper(nameof(RB_Student_Makeup.ClassCheckId), model.ClassCheckId),
new WhereHelper(nameof(RB_Student_Makeup.OrderGuestId), model.OrderGuestId)
};
return base.Exists("Id", whereHelpers);
}
}
......
......@@ -69,13 +69,17 @@ namespace Edu.Repository.EduTask
SELECT A.* {0}
FROM RB_Education_Receipt AS A
WHERE 1=1
",isSpecNode);
", isSpecNode);
if (query != null)
{
if (query.Group_Id > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Education_Receipt_ViewModel.Group_Id), query.Group_Id);
}
if (!string.IsNullOrEmpty(query.QIds))
{
builder.AppendFormat(@" AND A.{0}IN({1}) ", nameof(RB_Education_Receipt_ViewModel.Id), query.QIds);
}
if (!string.IsNullOrEmpty(query.Title))
{
builder.AppendFormat(@" AND A.{0} LIKE @Title ", nameof(RB_Education_Receipt_ViewModel.Title));
......@@ -213,8 +217,8 @@ WHERE 1=1
//系统角色
else if (subItem.AuditType == Common.Enum.User.WFTAuditTypeEnum.Post)
{
var postIds= GetPostIdsRepository(model.Group_Id, subItem.PostType.ToString());
if (postIds!=null && postIds.Count>0)
var postIds = GetPostIdsRepository(model.Group_Id, subItem.PostType.ToString());
if (postIds != null && postIds.Count > 0)
{
AuditedId += string.Join(",", postIds) + ",";
subItem.PostUserIds = string.Join(",", postIds);
......@@ -231,9 +235,9 @@ WHERE 1=1
AuditType = item.FlowAduitList[0].AuditType,
OriginalAuditId = 0,
RoleOrInitiator = 0,
PostIds ="",
PostIds = "",
UserIds = "",
SysPostIds="",
SysPostIds = "",
ToAuditId = AuditedId.TrimEnd(','),
Sort = item.SortNum,
SpecialNode = item.FlowAduitList[0].IsSpecNode,
......@@ -382,13 +386,13 @@ WHERE 1=1
/// <returns></returns>
public List<int> GetPostIdsRepository(int GroupId, string PostId)
{
List<int> result = new List<int> ();
List<int> result = new List<int>();
var list = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Group_Id = GroupId,
QPostIds = PostId
});
if (list!=null &&list.Count > 0)
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
......
......@@ -45,6 +45,11 @@ namespace Edu.WebApi.Controllers.EduTask
ReceiptType = base.ParmJObj.GetInt("ReceiptType"),
Title = base.ParmJObj.GetStringValue("Title"),
};
var id = base.ParmJObj.GetInt("Id");
if (id > 0)
{
query.QIds = id.ToString();
}
query.CreateBy = base.UserInfo.Id;
var list = educationReceiptModule.GetEducationReceiptPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
pageModel.PageData = list;
......
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