lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序接口、培训计划界面调优

Browse Source
This commit is contained in:
夏菊
2025-03-05 17:00:55 +08:00
parent e975ddbf1d
commit 02ba872cee
20 changed files with 422 additions and 1637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs
+13 -4
View File
@@ -13,20 +13,21 @@ namespace WebAPI.Controllers
/// </summary>
public class TrainingTaskController : ApiController
{
#region 根据ProjectId、PersonId获取培训任务教材明细列表
#region 根据ProjectId、PersonId获取培训任务列表
/// <summary>
/// 根据ProjectId、PersonId获取培训任务教材明细列表
/// </summary>
/// <param name="projectId"></param>
/// <param name="personId"></param>
/// <param name="pageIndex">1-培训中；2-已完成</param>
/// <param name="isRetakeCourse">是否重修：1：重修任务</param>
/// <param name="pageIndex">页码</param>
/// <returns></returns>
public Model.ResponeData getTrainingTaskListByProjectIdPersonId(string projectId, string personId, int pageIndex)
public Model.ResponeData getTrainingTaskListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse, int pageIndex)
{
var responeData = new Model.ResponeData();
try
{
var getQualityLists = APITrainingTaskService.getTrainingTaskListByProjectIdPersonId(projectId, personId);
var getQualityLists = APITrainingTaskService.getTrainingTaskListByProjectIdPersonId(projectId, personId, isRetakeCourse);
int pageCount = getQualityLists.Count;
if (pageCount > 0 && pageIndex > 0)
{
@@ -128,6 +129,14 @@ namespace WebAPI.Controllers
}
#endregion
/// <summary>
/// 维护任务学习时长
/// </summary>
/// <param name="taskItemId"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="VideoProgress"></param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime, string VideoProgress)
{
SGGL/WebAPI/Controllers/PersonController.cs → SGGL/WebAPI/Controllers/Person/PersonController.cs
+52 -22
View File
@@ -1,24 +1,55 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Http;
using SgManager.AI;
using System.Configuration;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Aspose.Words;
using Microsoft.Office.Interop.Excel;
using System.Net;
using System.Web.Http.Results;
namespace WebAPI.Controllers
{
/// <summary>
///
/// 人员信息
/// </summary>
public class PersonController : ApiController
{
#region 根据personid获取人员档案基本信息
/// <summary>
/// 根据personid获取人员档案基本信息
/// </summary>
/// <param name="personId"></param>
/// <returns></returns>
public Model.ResponeData getPersonInfoByPersonId(string personId)
{
var responeData = new Model.ResponeData();
try
{
var personData = APIPersonService.getPersonByPersonId(personId);
PersonInfoItem data = new PersonInfoItem();
data.PersonId = personData.PersonId;
data.PersonName = personData.PersonName;
data.SexName = personData.SexName;
data.IdentityCard = personData.IdentityCard;
data.Telephone = personData.Telephone;
data.UnitName = personData.UnitName;
data.TeamGroupName = personData.TeamGroupName;
data.WorkPostName = personData.WorkPostName;
data.InTime = personData.InTime;
data.PhotoUrl = personData.PhotoUrl;
//获取用户本年HSE分值、培训学时（待处理）
data.HSEScore = 0;
data.LearnHour = 0;
responeData.data = data;
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据personid获取人员信息
/// <summary>
/// 根据personid获取人员信息
@@ -37,7 +68,6 @@ namespace WebAPI.Controllers
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
@@ -462,10 +492,10 @@ namespace WebAPI.Controllers
if (getPerson != null && getPerson.PersonId != person.PersonId && !string.IsNullOrEmpty(person.PersonId))
{
getPerson.InTime = Funs.GetNewDateTime(person.InTime);
getPerson.OutTime = Funs.GetNewDateTime(person.OutTime);
if (!string.IsNullOrEmpty(person.TeamGroupId))
{
getPerson.TeamGroupId = person.TeamGroupId;
@@ -502,7 +532,7 @@ namespace WebAPI.Controllers
getPerson.WorkPostId = post.WorkPostId;
}
}
if (person.IsUsed == true)
{
getPerson.IsUsed = true;
@@ -683,12 +713,12 @@ namespace WebAPI.Controllers
/// <param name="personId"></param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData getPersonPresenceData(string projectId,DateTime date)
public Model.ResponeData getPersonPresenceData(string projectId, DateTime date)
{
var responeData = new Model.ResponeData();
try
{
responeData.data= APIPersonService.getPersonPresenceData(projectId, date);
responeData.data = APIPersonService.getPersonPresenceData(projectId, date);
}
catch (Exception ex)
{
@@ -814,8 +844,8 @@ namespace WebAPI.Controllers
x.ExchangeTime,
x.ExchangeTime2,
x.PhotoUrl,
IsUsed = x.IsUsed?1:0,
BlackList = x.BlackList.HasValue&& x.BlackList.Value ? 1 : 0
IsUsed = x.IsUsed ? 1 : 0,
BlackList = x.BlackList.HasValue && x.BlackList.Value ? 1 : 0
};
}
catch (Exception ex)
@@ -835,7 +865,7 @@ namespace WebAPI.Controllers
responeData.data = from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.BlackList == null || x.BlackList == false
where x.ProjectId == projectId
where x.ProjectId == projectId
&& (!x.OutTime.HasValue || x.OutTime > DateTime.Now) && x.InTime.HasValue && x.InTime < DateTime.Now
&& x.IsUsed == true
&& x.PhotoUrl != null
@@ -877,8 +907,8 @@ namespace WebAPI.Controllers
try
{
responeData.data = from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == projectId
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == projectId
select new
{
x.PersonId,
@@ -1126,6 +1156,6 @@ namespace WebAPI.Controllers
#endregion
}
}