提交代码
This commit is contained in:
@@ -285,7 +285,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage
|
||||
select a;
|
||||
if (defaultDatas.Count() > 0)
|
||||
{
|
||||
var groups = defaultDatas.GroupBy(x => new { x.GroupName});
|
||||
var groups = defaultDatas.GroupBy(x => new { x.GroupName });
|
||||
int firstnum = 1;
|
||||
foreach (var itemGroup in groups)
|
||||
{
|
||||
@@ -516,7 +516,7 @@ namespace FineUIPro.Web.TestRun.TestRunManage
|
||||
model.InspectedUser = !string.IsNullOrWhiteSpace(values.Value<string>("InspectedUser")) ? values.Value<string>("InspectedUser") : string.Empty;
|
||||
model.WorkInspectName = values.Value<string>("WorkInspectName");
|
||||
//删除检查项检查人表
|
||||
var deleteTermUser = Funs.DB.TestRun_TermItemInspectedUser.Where(x => x.TermItemId == termItemId);
|
||||
var deleteTermUser = Funs.DB.TestRun_TermItemInspectedUser.Where(x => x.TermItemId == termItemId && x.InspectionResults == null);
|
||||
if (deleteTermUser.Count() > 0)
|
||||
{
|
||||
Funs.DB.TestRun_TermItemInspectedUser.DeleteAllOnSubmit(deleteTermUser);
|
||||
@@ -528,19 +528,22 @@ namespace FineUIPro.Web.TestRun.TestRunManage
|
||||
var users = values.Value<string>("InspectedUser").Split(',');
|
||||
foreach (var itemUser in users)
|
||||
{
|
||||
var userModel = new TestRun_TermItemInspectedUser();
|
||||
userModel.ItemUserId = Guid.NewGuid().ToString();
|
||||
userModel.TermItemId = termItemId;
|
||||
userModel.SubInspectId = subTrem.SubInspectId;
|
||||
userModel.WorkPackId = workPackId;
|
||||
userModel.GroupName = groupName;
|
||||
userModel.ProjectId = this.CurrUser.LoginProjectId;
|
||||
userModel.InspectedUser = itemUser;
|
||||
userModel.AddUser = this.CurrUser.UserId;
|
||||
userModel.AddTime = DateTime.Now;
|
||||
userModel.Sort = usernum;
|
||||
tremItemUsers.Add(userModel);
|
||||
usernum++;
|
||||
if (Funs.DB.TestRun_TermItemInspectedUser.Count(x => x.TermItemId == termItemId && x.InspectedUser == itemUser) == 0)
|
||||
{
|
||||
var userModel = new TestRun_TermItemInspectedUser();
|
||||
userModel.ItemUserId = Guid.NewGuid().ToString();
|
||||
userModel.TermItemId = termItemId;
|
||||
userModel.SubInspectId = subTrem.SubInspectId;
|
||||
userModel.WorkPackId = workPackId;
|
||||
userModel.GroupName = groupName;
|
||||
userModel.ProjectId = this.CurrUser.LoginProjectId;
|
||||
userModel.InspectedUser = itemUser;
|
||||
userModel.AddUser = this.CurrUser.UserId;
|
||||
userModel.AddTime = DateTime.Now;
|
||||
userModel.Sort = usernum;
|
||||
tremItemUsers.Add(userModel);
|
||||
usernum++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (subTrems != null) Funs.DB.TestRun_SubInspectTerm.InsertAllOnSubmit(subTrems);
|
||||
|
||||
Reference in New Issue
Block a user