Skip to content

E
Education
Commit 280c6474 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 97e2c31d
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 4 deletions
Edu.Module.OKR/OKRPeriodModule.cs
View file @ 280c6474
...@@ -1473,6 +1473,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru ...@@ -1473,6 +1473,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
}), }),
}) })
}), }),
x.AuditRemark,
AuditTime= Common.ConvertHelper.FormatTime(x.AuditTime),
x.AuditUserId,
AccountName= UserReidsCache.GetUserLoginInfo((x.CreateBy > 0?x.CreateBy:0))?.AccountName??"",
UserIcon = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.UserIcon ?? "",
}); });
} }
...@@ -1863,6 +1868,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru ...@@ -1863,6 +1868,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
}), }),
}) })
}), }),
x.AuditRemark,
AuditTime= Common.ConvertHelper.FormatTime(x.AuditTime),
x.AuditUserId,
AccountName = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.AccountName ?? "",
UserIcon = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.UserIcon ?? "",
}) })
}; };
} }
...@@ -2988,6 +2998,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru ...@@ -2988,6 +2998,11 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
}), }),
}) })
}), }),
x.AuditRemark,
AuditTime = Common.ConvertHelper.FormatTime(x.AuditTime),
x.AuditUserId,
AccountName = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.AccountName ?? "",
UserIcon = UserReidsCache.GetUserLoginInfo((x.CreateBy > 0 ? x.CreateBy : 0))?.UserIcon ?? "",
}; };
} }
......
Edu.WebApi/Controllers/OKR/OKRPeriodController.cs
View file @ 280c6474
...@@ -1044,10 +1044,10 @@ namespace Edu.WebApi.Controllers.OKR ...@@ -1044,10 +1044,10 @@ namespace Edu.WebApi.Controllers.OKR
var userInfo = base.UserInfo; var userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString()); JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int PeriodId = parms.GetInt("PeriodId", 0); int PeriodId = parms.GetInt("PeriodId", 0);
if (PeriodId <= 0) //if (PeriodId <= 0)
{ //{
return ApiResult.ParamIsNull(); // return ApiResult.ParamIsNull();
} //}
var obj = okrPeriodModule.GetOKRMyEmployeeAuditList(PeriodId, userInfo); var obj = okrPeriodModule.GetOKRMyEmployeeAuditList(PeriodId, userInfo);
return ApiResult.Success("", obj); return ApiResult.Success("", obj);
......
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