diff --git a/.gitignore b/.gitignore index 2655076..f32177d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ /SUBQHSE/DataExchange/bin /SUBQHSE/DataExchange/obj/Debug /SUBQHSEPackFile -/SGGLPackFile *.user /SUBQHSE/FineUIPro.Web/File/Excel/Temp *.xml @@ -37,4 +36,3 @@ /SUBQHSEPackFile_2023-8-31_001/PackFile/aspnet_client/FreeTextBox/images/css/toolbarbutton.off.over.gif /SUBQHSE/Backup /SUBQHSE/BLLTests1 -/SGGL/FineUIPro.Web/ErrLog.txt \ No newline at end of file diff --git a/.vs/新疆油建/v17/.wsuo b/.vs/新疆油建/v17/.wsuo new file mode 100644 index 0000000..099d780 Binary files /dev/null and b/.vs/新疆油建/v17/.wsuo differ diff --git a/.vs/新疆油建/v17/DocumentLayout.json b/.vs/新疆油建/v17/DocumentLayout.json new file mode 100644 index 0000000..41d2778 --- /dev/null +++ b/.vs/新疆油建/v17/DocumentLayout.json @@ -0,0 +1,85 @@ +{ + "Version": 1, + "WorkspaceRootPath": "E:\\\u8BFA\u5FC5\u8FBE\\\u65B0\u7586\u6CB9\u5EFA\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 1, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedHeight": 1230, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:143:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:149:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:144:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:147:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:148:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:173:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:174:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:172:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:145:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:146:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + } + ] + }, + { + "DockedHeight": 228, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{34e76e81-ee4a-11d0-ae2e-00a0c90fffc3}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index c154f22..6ad72c7 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -1660,302 +1660,5 @@ namespace BLL } } } - - #region 根据培训类型获取项目培训人员信息 - /// - /// 根据培训类型获取项目培训人员信息 - /// - /// 项目ID - /// 培训单位ID - /// 培训岗位ID - /// 培训类型ID - /// - public static List getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string departIds, string trainTypeId, string InTime, string strParam) - { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) - { - DateTime inDateTime = DateTime.Now; - if (!string.IsNullOrEmpty(InTime) && !"null".Equals(InTime)) - { - inDateTime = DateTime.Parse(InTime); - } - - List unitIdList = Funs.GetStrListByStr(unitIds, ','); - var getPersons = (from x in db.View_SitePerson_Person - where x.ProjectId == projectId && unitIdList.Contains(x.UnitId) && x.IsUsed == true && (string.IsNullOrEmpty(strParam) || x.PersonName.Contains(strParam)) && (string.IsNullOrEmpty(InTime) || x.InTime < inDateTime) - && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime >= DateTime.Now) - select new Model.PersonItem - { - PersonId = x.PersonId, - CardNo = x.CardNo, - PersonName = x.PersonName, - SexName = x.SexName, - IdentityCard = x.IdentityCard, - Address = x.Address, - ProjectId = x.ProjectId, - ProjectCode = x.ProjectCode, - ProjectName = x.ProjectName, - UnitId = x.UnitId, - UnitCode = x.UnitCode, - UnitName = x.UnitName, - TeamGroupId = x.TeamGroupId, - TeamGroupName = x.TeamGroupName, - WorkPostId = x.WorkPostId, - WorkPostName = x.WorkPostName, - InTime = string.Format("{0:yyyy-MM-dd}", x.InTime), - OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime), - OutResult = x.OutResult, - Telephone = x.Telephone, - PhotoUrl = x.PhotoUrl, - DepartName = x.DepartName, - }).ToList(); - - - - - if (!string.IsNullOrEmpty(workPostIds)) - { - List workPostIdList = Funs.GetStrListByStr(workPostIds, ','); - getPersons = getPersons.Where(x => workPostIdList.Contains(x.WorkPostId)).ToList(); - } - if (!string.IsNullOrEmpty(trainTypeId) && trainTypeId == Const.SpecialSafeTrainId)//专项安全培训 - { - var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList(); - getPersons = getPersons.Where(x => ids.Contains(x.WorkPostId)).ToList(); - } - List getTrainPersonList = new List(); - var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId); - if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat.Value == false)) - { - int score = 80; - var sysTestRule = db.Sys_TestRule.FirstOrDefault(); - if (sysTestRule != null) - { - if (sysTestRule.PassingScore > 0) - { - score = sysTestRule.PassingScore; - } - } - foreach (var item in getPersons) - { - var getTrainPersonIdList3 = (from x in db.Training_TestRecord - join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId - where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId - where x.TestScores > score - select x).FirstOrDefault(); - if (getTrainPersonIdList3 != null) - { - continue; - } - var getTrainPersonIdList1 = (from x in db.EduTrain_TrainRecordDetail - join y in db.EduTrain_TrainRecord on x.TrainingId equals y.TrainingId - where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && x.CheckResult == true && x.PersonId == item.PersonId - select x).FirstOrDefault(); - if (getTrainPersonIdList1 == null) - { - var getTrainPersonIdList2 = (from x in db.Training_Task - join y in db.Training_Plan on x.PlanId equals y.PlanId - where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.UserId == item.PersonId - - select x).FirstOrDefault(); - if (getTrainPersonIdList2 == null) - { - getTrainPersonList.Add(item); - } - } - } - return getTrainPersonList; - } - else if (getTrainType != null && getTrainType.IsRepeat.HasValue && getTrainType.IsRepeat.Value == true)//重复的 过滤人员 - { - foreach (var item in getPersons) - { - //int score = 80; - //var sysTestRule = db.Sys_TestRule.FirstOrDefault(); - //if (sysTestRule != null) - //{ - // if (sysTestRule.PassingScore > 0) - // { - // score = sysTestRule.PassingScore; - // } - //} - //var getTrainPersonIdList2 = (from x in db.Training_TestRecord - // join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId - // where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId - // where x.TestScores > score - // select x).FirstOrDefault(); - //if (getTrainPersonIdList2 != null) - //{ - // continue; - //} - getTrainPersonList.Add(item); - } - return getTrainPersonList; - } - //else if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false))//重复的 过滤人员 - //{ - // int score = 80; - // var sysTestRule = db.Sys_TestRule.FirstOrDefault(); - // if (sysTestRule != null) - // { - // if (sysTestRule.PassingScore > 0) - // { - // score = sysTestRule.PassingScore; - // } - // } - // foreach (var item in getPersons) - // { - - // var getTrainPersonIdList2 = (from x in db.Training_TestRecord - // join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId - // where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId - // where x.TestScores > score - // select x).FirstOrDefault(); - // if (getTrainPersonIdList2 != null) - // { - // continue; - // } - // getTrainPersonList.Add(item); - // } - // return getTrainPersonList; - //} - else - { - return getPersons.ToList(); - } - } - } - - - - - - #endregion - - #region 根据培训类型获取项目培训人员信息 - /// - /// 根据培训类型获取项目培训人员信息 - /// - /// 项目ID - /// 培训单位ID - /// 培训岗位ID - /// 培训类型ID - /// - public static List getTrainingPersonListByDepartAndTrainTypeId(string unitIds, string departIds, string trainTypeId) - { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) - { - List unitIdList = Funs.GetStrListByStr(unitIds, ','); - var getPersons = from x in db.Sys_User - where unitIdList.Contains(x.UnitId) - - select new Model.PersonItem - { - PersonId = x.UserId, - PersonName = x.UserName, - SexName = x.Sex, - IdentityCard = x.IdentityCard, - UnitId = x.UnitId, - WorkPostId = x.WorkPostId, - Telephone = x.Telephone, - PhotoUrl = x.PhotoUrl, - DepartId = x.DepartId - }; - if (!string.IsNullOrEmpty(departIds)) - { - List departIdList = Funs.GetStrListByStr(departIds, ','); - getPersons = getPersons.Where(x => departIdList.Contains(x.DepartId)); - } - foreach (var item in getPersons) - { - Model.Base_Unit unit = db.Base_Unit.FirstOrDefault(x => x.UnitId == item.UnitId); - if (!string.IsNullOrEmpty(item.UnitId)) - { - if (unit != null) - { - item.UnitCode = unit.UnitCode; - item.UnitName = unit.UnitName; - } - } - if (!string.IsNullOrEmpty(item.DepartId)) - { - Model.Base_Depart depart = db.Base_Depart.FirstOrDefault(x => x.DepartId == item.DepartId); - if (depart != null) - { - item.DepartName = depart.DepartName; - } - } - - } - if (!string.IsNullOrEmpty(trainTypeId) && trainTypeId == Const.SpecialSafeTrainId)//专项安全培训 - { - var ids = db.Base_WorkPost.Where(x => x.PostType == "2").Select(x => x.WorkPostId).ToList(); - getPersons = getPersons.Where(x => ids.Contains(x.WorkPostId)); - } - - List getTrainPersonList = new List(); - var getTrainType = db.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == trainTypeId); - - - - - if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false)) - { - int score = 80; - var sysTestRule = db.Sys_TestRule.FirstOrDefault(); - if (sysTestRule != null) - { - if (sysTestRule.PassingScore > 0) - { - score = sysTestRule.PassingScore; - } - } - - - foreach (var item in getPersons) - { - var getTrainPersonIdList3 = (from x in db.Training_TestRecord - join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId - where y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId - where x.TestScores > score - select x).FirstOrDefault(); - if (getTrainPersonIdList3 != null) - { - continue; - } - - var getTrainPersonIdList1 = (from x in db.EduTrain_TrainRecordDetail - join y in db.EduTrain_TrainRecord on x.TrainingId equals y.TrainingId - where y.ProjectId == null && y.TrainTypeId == trainTypeId && x.CheckResult == true && x.PersonId == item.PersonId - select x).FirstOrDefault(); - if (getTrainPersonIdList1 == null) - { - var getTrainPersonIdList2 = (from x in db.Training_Task - join y in db.Training_Plan on x.PlanId equals y.PlanId - where y.ProjectId == null && y.TrainTypeId == trainTypeId && y.States != "3" && x.UserId == item.PersonId - select x).FirstOrDefault(); - if (getTrainPersonIdList2 == null) - { - getTrainPersonList.Add(item); - } - } - } - return getTrainPersonList; - } - else - { - - - - return getPersons.ToList(); - } - } - } - - - - - - #endregion } } diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index e7e4028..0bf87ae 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -17,37 +17,7 @@ namespace BLL using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var getUser = db.View_Sys_User.FirstOrDefault(x => (x.Account == userInfo.Account || x.Telephone == userInfo.Telephone) && x.IsPost == true && x.Password == Funs.EncryptionPassword(userInfo.Password)); - if (getUser != null) - { - return ObjectMapperManager.DefaultInstance.GetMapper().Map(getUser); - } - else - { - var getPerson = from x in db.SitePerson_Person - where (x.Telephone == userInfo.Account || x.PersonName == userInfo.Account) - && (x.Password == Funs.EncryptionPassword(userInfo.Password) - || (x.IdentityCard != null && x.IdentityCard.Substring(x.IdentityCard.Length - 4) == userInfo.Password)) - && x.IsUsed == true - orderby x.InTime descending - select new Model.UserItem - { - UserId = x.PersonId, - UserCode = x.CardNo, - Password = x.Password, - UserName = x.PersonName, - UnitId = x.UnitId, - LoginProjectId = x.ProjectId, - IdentityCard = x.IdentityCard, - Account = x.PersonName, - UnitName = db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName, - LoginProjectName = db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName, - Telephone = x.Telephone, - WorkPostId = x.WorkPostId, - WorkPostName = db.Base_WorkPost.First(w => w.WorkPostId == x.WorkPostId).WorkPostName, - }; - return getPerson.FirstOrDefault(); - } - + return ObjectMapperManager.DefaultInstance.GetMapper().Map(getUser); } } diff --git a/SGGL/BLL/API/HSSE/APITestPlanService.cs b/SGGL/BLL/API/HSSE/APITestPlanService.cs index d72d0c5..291f1f9 100644 --- a/SGGL/BLL/API/HSSE/APITestPlanService.cs +++ b/SGGL/BLL/API/HSSE/APITestPlanService.cs @@ -24,53 +24,24 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - if (string.IsNullOrEmpty(projectId)) - { - var getDataLists = (from x in db.Training_TestPlan - where (x.ProjectId == null || x.ProjectId=="") && (x.States == states || states == null) - orderby x.TestStartTime descending - select new Model.TestPlanItem - { - TestPlanId = x.TestPlanId, - TestPlanCode = x.PlanCode, - TestPlanName = x.PlanName, - ProjectId = x.ProjectId, - DepartIds = x.DepartIds, - DepartNames = WorkPostService.getDepartNamesByIdsForApi(x.DepartIds), - TestPlanManId = x.PlanManId, - TestPlanManName = db.Sys_User.First(y => y.UserId == x.PlanManId).UserName, - TestPalce = x.TestPalce, - TestStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestStartTime), - TestEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestEndTime), - States = x.States, - QRCodeUrl = x.QRCodeUrl.Replace('\\', '/'), - }).ToList(); - return getDataLists; - } - else - { - var getDataLists = (from x in db.Training_TestPlan - where x.ProjectId == projectId && (x.States == states || states == null) - orderby x.TestStartTime descending - select new Model.TestPlanItem - { - TestPlanId = x.TestPlanId, - TestPlanCode = x.PlanCode, - TestPlanName = x.PlanName, - ProjectId = x.ProjectId, - TestPlanManId = x.PlanManId, - DepartIds = x.DepartIds, - DepartNames = WorkPostService.getDepartNamesByIdsForApi(x.DepartIds), - TestPlanManName = db.Sys_User.First(y => y.UserId == x.PlanManId).UserName, - TestPalce = x.TestPalce, - TestStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestStartTime), - TestEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestEndTime), - States = x.States, - QRCodeUrl = x.QRCodeUrl.Replace('\\', '/'), - }).ToList(); - return getDataLists; - - } + var getDataLists = (from x in db.Training_TestPlan + where x.ProjectId == projectId && (x.States == states || states == null) + orderby x.TestStartTime descending + select new Model.TestPlanItem + { + TestPlanId = x.TestPlanId, + TestPlanCode = x.PlanCode, + TestPlanName = x.PlanName, + ProjectId = x.ProjectId, + TestPlanManId = x.PlanManId, + TestPlanManName = db.Sys_User.First(y => y.UserId == x.PlanManId).UserName, + TestPalce = x.TestPalce, + TestStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestStartTime), + TestEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestEndTime), + States = x.States, + QRCodeUrl = x.QRCodeUrl.Replace('\\', '/'), + }).ToList(); + return getDataLists; } } #endregion @@ -109,13 +80,9 @@ namespace BLL UnitNames = UnitService.getUnitNamesUnitIds(x.UnitIds), WorkPostIds = x.WorkPostIds, WorkPostNames = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostIds), - DepartIds = x.DepartIds, - DepartNames = WorkPostService.getDepartNamesByIdsForApi(x.DepartIds), States = x.States, QRCodeUrl = x.QRCodeUrl.Replace('\\', '/'), TrainingPlanId = x.PlanId, - TrainTypeId = x.TrainTypeId, - TrainTypeName = db.Base_TrainType.Where(xx => xx.TrainTypeId == x.TrainTypeId).Select(xx => xx.TrainTypeName).FirstOrDefault() }; return getDataLists.FirstOrDefault(); } @@ -263,9 +230,8 @@ namespace BLL ////新增考试人员明细 foreach (var item in getTestPlan.TestRecordItems) { - var user = db.Sys_User.FirstOrDefault(e => e.UserId == item.TestManId); - var person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == item.TestManId); - if (user != null || person != null) + var person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == item.TestManId); + if (person != null) { Model.Training_TestRecord newTrainDetail = new Model.Training_TestRecord { @@ -388,17 +354,15 @@ namespace BLL TestStartTime = DateTime.Now, TestPalce = getTrainingPlan.TeachAddress, UnitIds = getTrainingPlan.UnitIds, - UnitNames = UnitService.getUnitNamesUnitIdsForApi(getTrainingPlan.UnitIds), + UnitNames = UnitService.getUnitNamesUnitIds(getTrainingPlan.UnitIds), WorkPostIds = getTrainingPlan.WorkPostId, - WorkPostNames = WorkPostService.getWorkPostNamesWorkPostIdsForApi(getTrainingPlan.WorkPostId), - DepartIds = getTrainingPlan.DepartIds, - DepartNames = WorkPostService.getDepartNamesByIdsForApi(getTrainingPlan.DepartIds), + WorkPostNames = WorkPostService.getWorkPostNamesWorkPostIds(getTrainingPlan.WorkPostId), PlanId = getTrainingPlan.PlanId, States = "0", }; string unitId = string.Empty; - var user = db.Sys_User.FirstOrDefault(e => e.UserId == userId); + var user = db.Sys_User.FirstOrDefault(e => e.UserId == userId); if (user != null) { unitId = user.UnitId; @@ -448,7 +412,7 @@ namespace BLL { db.Training_TestPlan.InsertOnSubmit(newTestPlan); db.SubmitChanges(); - CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectTestPlanMenuId, newTestPlan.ProjectId, null, testPlanId, newTestPlan.PlanDate); + CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectTestPlanMenuId, newTestPlan.ProjectId, null, testPlanId, newTestPlan.PlanDate); ///培训人员 var getTrainingTask = (from x in db.Training_Task where x.PlanId == trainingPlanId select x).ToList(); foreach (var itemTask in getTrainingTask) @@ -459,7 +423,7 @@ namespace BLL ProjectId = getTrainingPlan.ProjectId, TestPlanId = testPlanId, TestManId = itemTask.UserId, - TestType = db.Base_TrainType.First(z => z.TrainTypeId == getTrainingPlan.TrainTypeId).TrainTypeName, + TestType= db.Base_TrainType.First(z=>z.TrainTypeId == getTrainingPlan.TrainTypeId).TrainTypeName, }; db.Training_TestRecord.InsertOnSubmit(newTestRecord); diff --git a/SGGL/BLL/API/HSSE/APITestRecordService.cs b/SGGL/BLL/API/HSSE/APITestRecordService.cs index ac9e18a..0f83682 100644 --- a/SGGL/BLL/API/HSSE/APITestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APITestRecordService.cs @@ -29,7 +29,7 @@ namespace BLL ProjectId = x.ProjectId, TestPlanId = x.TestPlanId, TestManId = x.TestManId, - TestManName = getPname(x.TestManId), + TestManName = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == x.TestManId).PersonName, TestStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestStartTime), TestEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestEndTime), TestScores = x.TestScores ?? 0, @@ -39,26 +39,6 @@ namespace BLL return getDataLists; } } - - private static string getPname(string TestManId) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - var pname = ""; - var personModel = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == TestManId); - if (personModel==null) - { - var unameModel = db.Sys_User.FirstOrDefault(p=>p.UserId== TestManId); - if (unameModel!=null) - { - pname = unameModel.UserName; - } - } - else { - pname = personModel.PersonName; - } - - return pname; - } - } #endregion #region 根据试卷ID获取试卷记录详细 @@ -101,7 +81,7 @@ namespace BLL /// /// /// - public static string CreateTestRecordItem(Model.Training_TestPlan getTestPlan, string testRecordId, Model.SitePerson_Person person, Model.Sys_User user) + public static string CreateTestRecordItem(Model.Training_TestPlan getTestPlan, string testRecordId, Model.SitePerson_Person person) { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { @@ -128,22 +108,9 @@ namespace BLL int sumTestType3Count = testPlanTrainings.Sum(x => x.TestType3Count) ?? 0; ////获取类型下适合岗位试题集合 - List getTestTrainingItemALLs; - string WorkPostId = ""; - string DepartId = ""; - if (person != null) - { - WorkPostId = person.WorkPostId; - } - if (user != null) - { - DepartId = user.DepartId; - } - - getTestTrainingItemALLs = (from x in db.Training_TestTrainingItem - where x.TrainingId != null && (x.WorkPostIds == null || string.IsNullOrEmpty(WorkPostId) || x.WorkPostIds.Contains(WorkPostId)) || (x.DepartIds == null || string.IsNullOrEmpty(DepartId) || x.DepartIds.Contains(DepartId)) - - select x).ToList(); + var getTestTrainingItemALLs = from x in db.Training_TestTrainingItem + where x.TrainingId != null && (x.WorkPostIds == null || (x.WorkPostIds.Contains(person.WorkPostId) && person.WorkPostId != null)) + select x; foreach (var itemT in testPlanTrainings) { //// 获取类型下的题目 @@ -234,170 +201,12 @@ namespace BLL db.Training_TestRecordItem.InsertAllOnSubmit(getItems); db.SubmitChanges(); - BLL.RedisHelper redis = new BLL.RedisHelper(); - redis.SetObjString(testRecordId, getItems); } } } return testRecordId; } #endregion - - public static string CreateTestRecordItem(Model.Training_CompanyTrainingItem getCompanyTraining, string testRecordId, Model.SitePerson_Person person, Model.Sys_User user) - { - - - - - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) - { - var trainingIds = getCompanyTraining.TestTrainingIds.Split(','); - var testTrainings = db.Training_TestTraining.Where(x => trainingIds.Contains(x.TrainingId)); - var getTestRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecordId); - if (getTestRecord != null && !getTestRecord.TestStartTime.HasValue) - { - ////考试时长 - getTestRecord.Duration = 120; - getTestRecord.TestStartTime = DateTime.Now; - db.SubmitChanges(); - } - - ////当前人考试记录 未加入考试计划的 当考试开始扫码时 不允许再参与考试 - var item = db.Training_TestRecordItem.FirstOrDefault(x => x.TestRecordId == getTestRecord.TestRecordId); - if (item == null) - { - List getTestTrainingItemList = new List(); - //var testPlanTrainings = from x in db.Training_TestPlanTraining - // where x.TestPlanId == getTestPlan.TestPlanId - // select x; - //// 计划考试中单选、多选、判断题总数 - var sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault(); - - int sumTestType1Count = 0;// testPlanTrainings.Sum(x => x.TestType1Count) ?? 0; - int sumTestType2Count = 0;//testPlanTrainings.Sum(x => x.TestType2Count) ?? 0; - int sumTestType3Count = 0;//testPlanTrainings.Sum(x => x.TestType3Count) ?? 0; - if (sysTestRule != null) - { - - sumTestType1Count = sysTestRule.SCount; - sumTestType2Count = sysTestRule.MCount; - sumTestType3Count = sysTestRule.JCount; - } - ////获取类型下适合岗位试题集合 - List getTestTrainingItemALLs; - string WorkPostId = ""; - string DepartId = ""; - if (person != null) - { - WorkPostId = person.WorkPostId; - } - if (user != null) - { - DepartId = user.DepartId; - } - - getTestTrainingItemALLs = (from x in db.Training_TestTrainingItem - where x.TrainingId != null && (x.WorkPostIds == null || string.IsNullOrEmpty(WorkPostId) || x.WorkPostIds.Contains(WorkPostId)) || (x.DepartIds == null || string.IsNullOrEmpty(DepartId) || x.DepartIds.Contains(DepartId)) - select x).ToList(); - foreach (var itemT in testTrainings) - { - //// 获取类型下的题目 - var getTestTrainingItems = getTestTrainingItemALLs.Where(x => x.TrainingId == itemT.TrainingId).ToList(); - if (getTestTrainingItems.Count() > 0) - { - ////单选题 - var getSItem = getTestTrainingItems.Where(x => x.TestType == "1").OrderBy(x => Guid.NewGuid()).Take(sumTestType1Count); - if (getSItem.Count() > 0) - { - getTestTrainingItemList.AddRange(getSItem); - } - ///多选题 - var getMItem = getTestTrainingItems.Where(x => x.TestType == "2").OrderBy(x => Guid.NewGuid()).Take(sumTestType2Count); - if (getMItem.Count() > 0) - { - getTestTrainingItemList.AddRange(getMItem); - } - ///判断题 - var getJItem = getTestTrainingItems.Where(x => x.TestType == "3").OrderBy(x => Guid.NewGuid()).Take(sumTestType3Count); - if (getJItem.Count() > 0) - { - getTestTrainingItemList.AddRange(getJItem); - } - } - } - //// 获取得到的单选题、多选题、判断题 数量 - int getDiffTestType1Count = sumTestType1Count - getTestTrainingItemList.Where(x => x.TestType == "1").Count(); - int getDiffTestType2Count = sumTestType2Count - getTestTrainingItemList.Where(x => x.TestType == "2").Count(); - int getDiffTestType3Count = sumTestType3Count - getTestTrainingItemList.Where(x => x.TestType == "3").Count(); - if (getDiffTestType1Count > 0 || getDiffTestType2Count > 0 || getDiffTestType3Count > 0) - { - var getTestTrainingItemNulls = getTestTrainingItemALLs.Where(x => x.WorkPostIds == null).ToList(); - if (getTestTrainingItemNulls.Count() > 0) - { - /// 通用且未选择的题目 - var getTestTrainingItemDiffs = getTestTrainingItemNulls.Except(getTestTrainingItemList).ToList(); - ////单选题 - if (getDiffTestType1Count > 0) - { - var getSItemD = getTestTrainingItemDiffs.Where(x => x.TestType == "1").OrderBy(x => Guid.NewGuid()).Take(getDiffTestType1Count); - if (getSItemD.Count() > 0) - { - getTestTrainingItemList.AddRange(getSItemD); - } - } - ///多选题 - if (getDiffTestType2Count > 0) - { - var getMItemD = getTestTrainingItemDiffs.Where(x => x.TestType == "2").OrderBy(x => Guid.NewGuid()).Take(getDiffTestType2Count); - if (getMItemD.Count() > 0) - { - getTestTrainingItemList.AddRange(getMItemD); - } - } - ///判断题 - if (getDiffTestType3Count > 0) - { - var getJItemD = getTestTrainingItemDiffs.Where(x => x.TestType == "3").OrderBy(x => Guid.NewGuid()).Take(getDiffTestType3Count); - if (getJItemD.Count() > 0) - { - getTestTrainingItemList.AddRange(getJItemD); - } - } - } - } - - if (getTestTrainingItemList.Count() > 0) - { - var getItems = from x in getTestTrainingItemList - select new Model.Training_TestRecordItem - { - TestRecordItemId = SQLHelper.GetNewID(), - TestRecordId = getTestRecord.TestRecordId, - TrainingItemName = x.TrainingItemName, - TrainingItemCode = x.TrainingItemCode, - Abstracts = x.Abstracts, - AttachUrl = x.AttachUrl, - TestType = x.TestType, - AItem = x.AItem, - BItem = x.BItem, - CItem = x.CItem, - DItem = x.DItem, - EItem = x.EItem, - AnswerItems = x.AnswerItems, - Score = x.TestType == "1" ? sysTestRule.SValue : (x.TestType == "2" ? sysTestRule.MValue : sysTestRule.JValue), - }; - - db.Training_TestRecordItem.InsertAllOnSubmit(getItems); - db.SubmitChanges(); - BLL.RedisHelper redis = new BLL.RedisHelper(); - redis.SetObjString(testRecordId, getItems); - } - } - } - return testRecordId; - } - - #region 根据PersonId、TestPlanId生成试卷 扫码生成试卷 /// /// 根据PersonId、TestPlanId生成试卷 扫码生成试卷 @@ -580,7 +389,7 @@ namespace BLL var getDataLists = (from x in db.Training_TestRecord join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId join z in db.SitePerson_Person on x.TestManId equals z.PersonId - where ((string.IsNullOrEmpty(projectId) && x.ProjectId == null) || (!string.IsNullOrEmpty(projectId) && x.ProjectId == projectId)) && x.TestStartTime.HasValue && x.TestEndTime.HasValue + where x.ProjectId == projectId && x.TestStartTime.HasValue && x.TestEndTime.HasValue orderby x.TestStartTime descending select new Model.TestRecordItem { @@ -864,103 +673,29 @@ namespace BLL /// public static string getResitTestRecord(Model.Training_TestRecord getTestRecord) { - using (var db = new Model.SGGLDB(Funs.ConnString)) + Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord { - Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord - { - TestRecordId = SQLHelper.GetNewID(), - ProjectId = getTestRecord.ProjectId, - TestPlanId = getTestRecord.TestPlanId, - TestManId = getTestRecord.TestManId, - TestType = getTestRecord.TestType, - TemporaryUser = getTestRecord.TemporaryUser, - Duration = getTestRecord.Duration, - // TestStartTime = DateTime.Now, - }; + TestRecordId = SQLHelper.GetNewID(), + ProjectId = getTestRecord.ProjectId, + TestPlanId = getTestRecord.TestPlanId, + TestManId = getTestRecord.TestManId, + TestType = getTestRecord.TestType, + TemporaryUser = getTestRecord.TemporaryUser, + Duration = getTestRecord.Duration, + // TestStartTime = DateTime.Now, + }; - db.Training_TestRecord.InsertOnSubmit(newTestRecord); - db.SubmitChanges(); + Funs.DB.Training_TestRecord.InsertOnSubmit(newTestRecord); + Funs.DB.SubmitChanges(); - var getTestPlan = db.Training_TestPlan.FirstOrDefault(x => x.TestPlanId == newTestRecord.TestPlanId); - var user = db.Sys_User.FirstOrDefault(x => x.UserId == newTestRecord.TestManId); - var person = PersonService.GetPersonByUserIdForApi(newTestRecord.TestManId, getTestPlan.ProjectId); - if (getTestPlan != null && person != null) - { - CreateTestRecordItem(getTestPlan, newTestRecord.TestRecordId, person, user); - } - return newTestRecord.TestRecordId; + var getTestPlan = Funs.DB.Training_TestPlan.FirstOrDefault(x => x.TestPlanId == newTestRecord.TestPlanId); + var person = PersonService.GetPersonByUserId(newTestRecord.TestManId, getTestPlan.ProjectId); + if (getTestPlan != null && person != null) + { + CreateTestRecordItem(getTestPlan, newTestRecord.TestRecordId, person); } + return newTestRecord.TestRecordId; } #endregion - - public static List getTrainingTestRecordListByDepartId(string unitId, string departId, string strPass, string strParam) - { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) - { - var getDataLists = (from x in db.Training_TestRecord - join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId - join z in db.Sys_User on x.TestManId equals z.UserId - where x.ProjectId == null && x.TestStartTime.HasValue && x.TestEndTime.HasValue - orderby x.TestStartTime descending - select new Model.TestRecordItem - { - TestRecordId = x.TestRecordId, - ProjectId = x.ProjectId, - TestPlanId = x.TestPlanId, - TestPlanName = y.PlanName, - UnitId = z.UnitId, - UnitName = getUnitName(z.UnitId), - WorkPostId = z.WorkPostId, - WorkPostName = db.Base_WorkPost.FirstOrDefault(p => p.WorkPostId == z.WorkPostId).WorkPostName, - DepartId = z.DepartId, - TestManId = x.TestManId, - TestManName = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == x.TestManId).PersonName, - TestStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestStartTime), - TestEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestEndTime), - Duration = x.Duration, - TestPlanEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestStartTime.Value.AddMinutes(x.Duration)), - TotalScore = y.TotalScore ?? 0, - TestScores = x.TestScores ?? 0, - TestType = x.TestType, - TemporaryUser = x.TemporaryUser, - }); - if (!string.IsNullOrEmpty(unitId)) - { - getDataLists = getDataLists.Where(x => x.UnitId == unitId); - } - if (!string.IsNullOrEmpty(departId)) - { - getDataLists = getDataLists.Where(x => x.DepartId == departId); - } - if (!string.IsNullOrEmpty(strParam)) - { - getDataLists = getDataLists.Where(x => x.TestManName.Contains(strParam)); - } - if (!string.IsNullOrEmpty(strPass)) - { - int PassingScore = SysConstSetService.getPassScoreForApi(); - if (strPass == "0") - { - getDataLists = getDataLists.Where(x => x.TestScores < PassingScore); - } - else - { - getDataLists = getDataLists.Where(x => x.TestScores >= PassingScore); - } - } - foreach (var item in getDataLists) - { - var depart = db.Base_Depart.FirstOrDefault(x => x.DepartId == item.DepartId); - if (depart != null) - { - item.DepartName = depart.DepartName; - } - - } - return getDataLists.ToList(); - } - } - - } } \ No newline at end of file diff --git a/SGGL/BLL/API/HSSE/APITrainRecordService.cs b/SGGL/BLL/API/HSSE/APITrainRecordService.cs index 9334889..82a9ff4 100644 --- a/SGGL/BLL/API/HSSE/APITrainRecordService.cs +++ b/SGGL/BLL/API/HSSE/APITrainRecordService.cs @@ -21,8 +21,7 @@ namespace BLL using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var getDataLists = (from x in db.EduTrain_TrainRecord - where ((string.IsNullOrEmpty(projectId) && x.ProjectId == null) - || (!string.IsNullOrEmpty(projectId) && (x.ProjectId == null || x.ProjectId == ""))) && x.TrainTypeId == trainTypeId + where x.ProjectId == projectId && x.TrainTypeId == trainTypeId orderby x.TrainStartDate descending select new Model.TrainRecordItem { diff --git a/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs b/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs index 360f015..d73e5d5 100644 --- a/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APITrainTestRecordService.cs @@ -22,7 +22,7 @@ namespace BLL using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_TrainTestRecord - where ((string.IsNullOrEmpty(projectId) && (x.ProjectId == null || x.ProjectId == "")) || (!string.IsNullOrEmpty(projectId) && x.ProjectId == projectId)) + where x.ProjectId == projectId orderby x.DateA descending select new Model.HSSE.TrainTestRecordItem { diff --git a/SGGL/BLL/API/HSSE/APITrainingPlanService.cs b/SGGL/BLL/API/HSSE/APITrainingPlanService.cs index cb198f1..8e55c7e 100644 --- a/SGGL/BLL/API/HSSE/APITrainingPlanService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingPlanService.cs @@ -21,15 +21,7 @@ namespace BLL using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var getDataLists = (from x in db.Training_Plan - where - ( - (string.IsNullOrEmpty(projectId) && (x.ProjectId == null || x.ProjectId == "")) - || - (!string.IsNullOrEmpty(projectId) && x.ProjectId == projectId) - ) - - && (x.States == states || states == null) - && x.TrainTypeId == trainTypeId + where x.ProjectId == projectId && (x.States == states || states == null) && x.TrainTypeId == trainTypeId orderby x.TrainStartDate descending select new Model.TrainingPlanItem { @@ -84,18 +76,14 @@ namespace BLL TeachMan = x.TeachMan, UnitIds = x.UnitIds, WorkPostId = x.WorkPostId, - DepartIds = x.DepartIds, - DepartNames = WorkPostService.getDepartNamesByIdsForApi(x.DepartIds), TrainContent = x.TrainContent, - UnitNames = UnitService.getUnitNamesUnitIdsForApi(x.UnitIds), - WorkPostNames = WorkPostService.getWorkPostNamesWorkPostIdsForApi(x.WorkPostId), + UnitNames = UnitService.getUnitNamesUnitIds(x.UnitIds), + WorkPostNames = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId), DesignerId = x.DesignerId, DesignerName = db.Sys_User.First(y => y.UserId == x.DesignerId).UserName, DesignerDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TrainStartDate), States = x.States, QRCodeUrl = x.QRCodeUrl.Replace('\\', '/'), - - TrainingTasks = getTrainingTasks(x.PlanId) }; return getDataLists.FirstOrDefault(); } @@ -148,7 +136,7 @@ namespace BLL { PlanId = trainingPlan.PlanId, PlanCode = trainingPlan.PlanCode, - + ProjectId = trainingPlan.ProjectId, DesignerId = trainingPlan.DesignerId, PlanName = trainingPlan.PlanName, TrainContent = trainingPlan.TrainContent, @@ -159,15 +147,9 @@ namespace BLL TrainTypeId = trainingPlan.TrainTypeId, UnitIds = trainingPlan.UnitIds, WorkPostId = trainingPlan.WorkPostId, - DepartIds = trainingPlan.DepartIds, - DepartNames = trainingPlan.DepartNames, States = trainingPlan.States, }; - if (!string.IsNullOrEmpty(trainingPlan.ProjectId)) - { - newTrainingPlan.ProjectId = trainingPlan.ProjectId; - } if (!string.IsNullOrEmpty(trainingPlan.TrainLevelId)) { newTrainingPlan.TrainLevelId = trainingPlan.TrainLevelId; @@ -218,8 +200,6 @@ namespace BLL isUpdate.UnitIds = newTrainingPlan.UnitIds; isUpdate.WorkPostId = newTrainingPlan.WorkPostId; isUpdate.States = newTrainingPlan.States; - isUpdate.DepartIds = newTrainingPlan.DepartIds; - isUpdate.DepartNames = newTrainingPlan.DepartNames; db.SubmitChanges(); } ////删除培训任务 @@ -295,24 +275,6 @@ namespace BLL } } - public static List getTrainingTasks(string planId) { - var list = new List(); - var taskList = Funs.DB.Training_Task.Where(x => x.PlanId == planId); - if (taskList.Count()>0) - { - foreach (var item in taskList) - { - var model = new Model.TrainingTaskItem(); - model.TaskId = item.TaskId; - model.PlanId = item.PlanId; - model.PersonId = item.UserId; - model.PersonName = UserService.GetUserNameByUserId(item.UserId); - list.Add(model); - } - } - return list; - } - /// /// 新增 培训人员明细 /// diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs index 190cdad..e7a2d97 100644 --- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs +++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs @@ -21,7 +21,7 @@ namespace BLL personId = PersonService.GetPersonIdByUserId(personId); var getDataLists = (from x in db.Training_Task join y in db.Training_Plan on x.PlanId equals y.PlanId - where ((string.IsNullOrEmpty(projectId) && (x.ProjectId == null || x.ProjectId == "")) || (!string.IsNullOrEmpty(projectId) && x.ProjectId == projectId)) && x.UserId == personId && y.States != "0" + where x.ProjectId == projectId && x.UserId == personId && y.States != "0" orderby x.TaskDate descending select new Model.TrainingTaskItem { @@ -31,30 +31,17 @@ namespace BLL PlanName = y.PlanName, TrainStartDate = string.Format("{0:yyyy-MM-dd HH:mm}", y.TrainStartDate), TeachAddress = y.TeachAddress, - PersonId = x.UserId, + //PersonId = x.UserId, PersonName = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == x.UserId).PersonName, TaskDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TaskDate), TrainTypeName = db.Base_TrainType.FirstOrDefault(b => b.TrainTypeId == y.TrainTypeId).TrainTypeName, TrainLevelName = db.Base_TrainLevel.FirstOrDefault(b => b.TrainLevelId == y.TrainLevelId).TrainLevelName, PlanStatesName = y.States == "3" ? "已完成" : "培训中", - TaskStatesName = x.States == "2" ? "已完成" : "培训中", - TrainingItemCode = getTrainingItemCode(y.PlanId) - }).ToList(); + + }).ToList(); return getDataLists; } } - - public static string getTrainingItemCode(string PlanId) - { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) - { - var ids = db.Training_PlanItem.Where(xx => xx.PlanId == PlanId).Select(x => x.CompanyTrainingItemId).ToList(); - var codes = db.Training_CompanyTrainingItem.Where(x => ids.Contains(x.CompanyTrainingItemId)).Select(x => x.CompanyTrainingItemCode); - string res = string.Join(",", codes); - return res; - } - return ""; - } #endregion #region 根据TaskId获取培训任务教材明细列表 @@ -71,8 +58,6 @@ namespace BLL GetDataService.CreateTrainingTaskItemByTaskId(taskId); var getDataLists = (from x in db.Training_TaskItem - join y in db.Training_CompanyTrainingItem on x.TrainingItemCode equals y.CompanyTrainingItemCode into temp - from y in temp.DefaultIfEmpty() where x.TaskId == taskId orderby x.TrainingItemCode select new Model.TrainingTaskItemItem @@ -80,16 +65,15 @@ namespace BLL TaskItemId = x.TaskItemId, TaskId = x.TaskId, PlanId = x.PlanId, - StartTime = x.StartTime, - EndTime = x.EndTime, - LearningTime = x.LearnTime, - AttachTime = y.LearningTime, - VideoProgress = x.VideoProgress, PersonId = x.PersonId, - TrainingItemCode = x.TrainingItemCode, + StartTime = x.StartTime, + EndTime = x.EndTime, + LearnTime = x.LearnTime, + VideoProgress = x.VideoProgress, + TrainingItemCode = x.TrainingItemCode, TrainingItemName = x.TrainingItemName, AttachUrl = x.AttachUrl.Replace('\\', '/'), - }).ToList(); + }).ToList(); return getDataLists; } } @@ -226,29 +210,10 @@ namespace BLL TaskId = x.TaskId, PlanId = x.PlanId, PersonId = x.UserId, - + PersonName = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == x.UserId).PersonName, TaskDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TaskDate), - States = x.States, + States = x.States, }).ToList(); - - foreach (var item in getDataLists) - { - var person = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == item.PersonId); - if (person != null) - { - item.PersonName = person.PersonName; - } - else - { - var sysUser = db.Sys_User.FirstOrDefault(p => p.UserId == item.PersonId); - if (sysUser != null) - { - item.PersonName = sysUser.UserName; - } - } - - } - return getDataLists; } } @@ -276,41 +241,19 @@ namespace BLL item.StartTime = startTime; } - //if (!item.LearnTime.HasValue) - //{ - // item.LearnTime = 0; - //} + if (!item.LearnTime.HasValue) + { + item.LearnTime = 0; + } if (!string.IsNullOrEmpty(VideoProgress)) { - //if (!item.VideoProgress.HasValue) - //{ - // item.VideoProgress = 0; - //} item.VideoProgress = int.Parse(VideoProgress); } var span = endTime.Subtract(startTime); - if (!item.LearnTime.HasValue) - { - item.LearnTime = 0; - } - item.LearnTime = item.LearnTime.Value + (int)span.TotalSeconds; - item.EndTime = endTime; - + item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes; + item.EndTime = endTime; db.SubmitChanges(); - - var companyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(x => x.CompanyTrainingItemCode == item.TrainingItemCode); - int companyTrainingItemLearnTime = companyTrainingItem?.LearningTime ?? 0; //培训教材时长（秒） - - - //如果学习时长大于培训教材时长，则关闭状态 - if (item.LearnTime > companyTrainingItemLearnTime) - { - var taskModel = db.Training_Task.FirstOrDefault(x => x.TaskId == item.TaskId); - taskModel.States = "2"; - db.SubmitChanges(); - } - - return item; + return item; } } #endregion diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 68bb9dd..54ba97a 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -21,8 +21,6 @@ - - true @@ -68,11 +66,8 @@ ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll @@ -105,18 +100,12 @@ ..\packages\MicrosoftOfficeCore.15.0.0\lib\net35\Office.dll False - - ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll - ..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll - - ..\packages\StackExchange.Redis.2.8.16\lib\net461\StackExchange.Redis.dll - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -133,14 +122,6 @@ - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - True - - - ..\packages\System.IO.Pipelines.5.0.1\lib\net461\System.IO.Pipelines.dll - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll @@ -157,11 +138,6 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - @@ -175,12 +151,6 @@ - - ..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - @@ -200,7 +170,6 @@ - @@ -299,9 +268,6 @@ - - - @@ -1175,13 +1141,6 @@ - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - True - False - True + false + false + true Release Any CPU FileSystem - G:\发布 + D:\发布 FileSystem <_TargetId>Folder diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index c5d0747..362e85c 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -229,7 +229,6 @@ -