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

1代码合并

Browse Source
This commit is contained in:
夏菊
2025-02-05 17:57:14 +08:00
parent 4bbce72980
commit 5712066e0a
57 changed files with 334 additions and 3709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/HJGL/ReportQueryController.cs
-92
View File
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Net;
using System.Net.Http;
@@ -186,95 +184,5 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
public Model.ResponeData GetReportQueryByProjectId(string projectId, string unitId)
{
var responeData = new Model.ResponeData();
try
{
List<Dictionary<string, string>> res = new List<Dictionary<string, string>>();
Dictionary<string, Dictionary<string, string>> tempDic = new Dictionary<string, Dictionary<string, string>>();
string sql31 = @"SELECT WorkArea.WorkAreaId, WorkArea.WorkAreaName, SUM(JOT_Size) total_jot, SUM(JOT_DoneDin) finished_total_jot
FROM pw_jointinfo
LEFT JOIN pw_isoinfo ON pw_jointinfo.ISO_ID = pw_isoinfo.ISO_ID
LEFT JOIN ProjectData_WorkArea WorkArea ON WorkArea.WorkAreaId = pw_isoinfo.WorkAreaId
WHERE pw_jointinfo.ProjectId = @projectId";
if (!string.IsNullOrEmpty(unitId) || unitId != CommonService.GetThisUnitId())
{
sql31 += " AND pw_isoinfo.UnitId = @unitId";
}
sql31 += " GROUP BY WorkArea.WorkAreaId, WorkArea.WorkAreaName";
SqlCommand command = new SqlCommand(sql31);
command.Parameters.AddWithValue("@projectId", projectId);
if (!string.IsNullOrEmpty(unitId))
{
command.Parameters.AddWithValue("@unitId", unitId);
}
DataTable tb31 = SQLHelper.GetDataTableRunCommand(command);
if (tb31 != null)
{
foreach (DataRow row in tb31.Rows)
{
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("WorkAreaName", row["WorkAreaName"].ToString());
dic.Add("finishRate", (100.0 * Funs.GetNewDoubleOrZero(row["finished_total_jot"].ToString()) / Funs.GetNewDoubleOrZero(row["total_jot"].ToString())).ToString("#0.00"));
tempDic.Add(row["WorkAreaName"].ToString(), dic);
res.Add(dic);
}
}
string sql41 = @"SELECT WorkArea.WorkAreaId, WorkArea.WorkAreaName, SUM(cht_totalfilm) total_film, SUM(cht_passfilm) pass_film
FROM CH_CheckItem ch_checkitem
LEFT JOIN PW_JointInfo JointInfo ON JointInfo.JOT_ID = ch_checkitem.JOT_ID
LEFT JOIN PW_IsoInfo IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID
LEFT JOIN ProjectData_WorkArea WorkArea ON WorkArea.WorkAreaId = IsoInfo.WorkAreaId
WHERE JointInfo.ProjectId = @projectId";
if (!string.IsNullOrEmpty(unitId) || unitId != CommonService.GetThisUnitId())
{
sql41 += " AND IsoInfo.UnitId = @unitId";
}
sql41 += " GROUP BY WorkArea.WorkAreaId, WorkArea.WorkAreaName";
SqlCommand command2 = new SqlCommand(sql41);
command2.Parameters.AddWithValue("@projectId", projectId);
if (!string.IsNullOrEmpty(unitId))
{
command2.Parameters.AddWithValue("@unitId", unitId);
}
DataTable tb41 = SQLHelper.GetDataTableRunCommand(command2);
if (tb41 != null)
{
foreach (DataRow row in tb41.Rows)
{
Dictionary<string, string> dic;
if (tempDic.TryGetValue(row["WorkAreaName"].ToString(), out dic))
{
dic.Add("passRate", (100.0 * Funs.GetNewDoubleOrZero(row["pass_film"].ToString()) / Funs.GetNewDoubleOrZero(row["total_film"].ToString())).ToString("#0.00"));
}
else
{
dic = new Dictionary<string, string>();
dic.Add("WorkAreaName", row["WorkAreaName"].ToString());
dic.Add("finishRate", "0");
dic.Add("passRate", (100.0 * Funs.GetNewDoubleOrZero(row["pass_film"].ToString()) / Funs.GetNewDoubleOrZero(row["total_film"].ToString())).ToString("#0.00"));
res.Add(dic);
}
}
}
responeData.data = res;
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}
SGGL/WebAPI/Controllers/HSSE/ChartAnalysisController.cs
-79
View File
@@ -35,84 +35,5 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
#region 根据项目ID 获取整改单数据
/// <summary>
/// 根据项目ID 获取整改单数据
/// </summary>
/// <param name="projectId">项目ID</param>
/// <returns></returns>
public Model.ResponeData getHSSERectifyNoticesChartAnalysis(string projectId)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
int allCount = 0, uCount = 0, cCount = 0;
double rate = 1;
var getRectifyNotices = from x in db.Check_RectifyNotices
where x.States != Const.State_0 && x.States != null && x.ProjectId == projectId
select x;
if (!string.IsNullOrEmpty(projectId) && projectId != "")
{
getRectifyNotices = getRectifyNotices.Where(x => x.ProjectId == projectId);
}
//// 整改总数
allCount = getRectifyNotices.Count();
if (allCount > 0)
{
//// 已闭环
cCount = getRectifyNotices.Where(x => x.States == "5").Count();
uCount = allCount - cCount;
rate = Math.Round(uCount * 1.0 / allCount * 100, 1);
}
responeData.data = new { allCount, uCount, rate };
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据项目ID 获取资质预警数据
/// <summary>
/// 根据项目ID 获取整改单数据
/// </summary>
/// <param name="projectId">项目ID</param>
/// <returns></returns>
public Model.ResponeData getHSSEPersonQualityChartAnalysis(string projectId)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
int allCount = 0;
var getPersonQualitys = from x in db.QualityAudit_PersonQuality
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
where (projectId == null || projectId == "" || y.ProjectId == projectId)
&& x.LimitDate.HasValue && x.LimitDate < DateTime.Now
select x;
//// 预警人数
allCount = getPersonQualitys.Count();
responeData.data = new { allCount };
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}
SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
+38 -176
View File
@@ -74,46 +74,29 @@ namespace WebAPI.Controllers
/// <param name="trainingPlanId">培训计划ID</param>
/// <param name="userId">用户ID</param>
/// <returns></returns>
public Model.ResponeData getSaveTestPlanByTrainingPlanId(string trainingPlanId, string userId)
public Model.ResponeData getSaveTestPlanByTrainingPlanId(string trainingPlanId,string userId)
{
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
var getTasks = new Model.SGGLDB(Funs.ConnString).Training_Task.FirstOrDefault(x => x.PlanId == trainingPlanId);
if (getTasks != null)
{
var getTasks = db.Training_Task.FirstOrDefault(x => x.PlanId == trainingPlanId);
if (getTasks != null)
if (CommonService.IsMainUnitOrAdmin(userId))
{
bool result = false;
if (userId == Const.sysglyId || userId == Const.hfnbdId)
{
result = true;
}
else
{
var user = db.Sys_User.FirstOrDefault(e => e.UserId == userId);
if (user != null && user.UnitId == CommonService.GetThisUnitId())
{
result = true;
}
}
if (result)
//if (CommonService.IsMainUnitOrAdmin(userId))
{
responeData.data = APITestPlanService.SaveTestPlanByTrainingPlanId(trainingPlanId, userId);
}
else
{
responeData.code = 0;
responeData.message = "非本单位用户，不能生成考试计划！";
}
responeData.data = APITestPlanService.SaveTestPlanByTrainingPlanId(trainingPlanId, userId);
}
else
{
responeData.code = 0;
responeData.message = "培训计划下没有培训人员，不能生成考试计划！";
responeData.message = "非本单位用户，不能生成考试计划！";
}
}
else
{
responeData.code = 0;
responeData.message = "培训计划下没有培训人员，不能生成考试计划！";
}
}
catch (Exception ex)
{
@@ -209,89 +192,45 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
using (var db = new Model.SGGLDB(Funs.ConnString))
var getTestPlan = new Model.SGGLDB(Funs.ConnString).Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId && e.States != "3" && e.TestStartTime <= DateTime.Now && e.TestEndTime >= DateTime.Now);
if (getTestPlan != null)
{
var getTestPlan = db.Training_TestPlan.FirstOrDefault(e => e.TestPlanId == testPlanId && e.States != "3" && e.TestStartTime <= DateTime.Now && e.TestEndTime >= DateTime.Now);
if (getTestPlan != null)
var person = PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
if (person != null )
{
var user = db.Sys_User.FirstOrDefault(x => x.UserId == personId);
Model.SitePerson_Person person;
if (user != null)
//2-考试中；生成考试试卷
if (getTestPlan.States == "2" )
{
person = db.SitePerson_Person.FirstOrDefault(e => (e.PersonId == personId || e.IdentityCard == user.IdentityCard) && e.ProjectId == getTestPlan.ProjectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
var testRecord = new Model.SGGLDB(Funs.ConnString).Training_TestRecord.FirstOrDefault(x => x.TestPlanId == getTestPlan.TestPlanId && x.TestManId == person.PersonId && !x.TestEndTime.HasValue);
if (testRecord != null)
{
string testRecordId = APITestRecordService.CreateTestRecordItem(getTestPlan, testRecord.TestRecordId, person);
responeData.code = 2;
responeData.data = new { testRecordId };
}
}
else
{
person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId && e.ProjectId == getTestPlan.ProjectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
}
if (person != null || user != null)
{
//2-考试中；生成考试试卷
if (getTestPlan.States == "2")
if (string.IsNullOrEmpty(getTestPlan.PlanId) && getTestPlan.UnitIds.Contains(person.UnitId) && (getTestPlan.WorkPostIds == null || getTestPlan.WorkPostIds.Contains(person.WorkPostId)))
{
var testRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == getTestPlan.TestPlanId && x.TestManId == personId && !x.TestEndTime.HasValue);
if (testRecord != null)
//0-待提交；1-已发布未考试 将人员添加进考试记录
var testTRecord = new Model.SGGLDB(Funs.ConnString).Training_TestRecord.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TestManId == personId);
if ((getTestPlan.States == "0" || getTestPlan.States == "1") && testTRecord == null && !string.IsNullOrEmpty(personId))
{
string testRecordId = APITestRecordService.CreateTestRecordItem(getTestPlan, testRecord.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
}
else if (person != null)
{
var testRecord2 = db.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == getTestPlan.TestPlanId && x.TestManId == person.PersonId && !x.TestEndTime.HasValue);
if (testRecord2 != null)
Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord
{
string testRecordId = APITestRecordService.CreateTestRecordItem(getTestPlan, testRecord2.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
}
TestRecordId = SQLHelper.GetNewID(),
ProjectId = getTestPlan.ProjectId,
TestPlanId = getTestPlan.TestPlanId,
TestManId = personId,
};
TestRecordService.AddTestRecord(newTestRecord);
responeData.code = 3;
responeData.message = "您已加入考试计划！";
}
}
else
{
if (person != null && string.IsNullOrEmpty(getTestPlan.PlanId) && getTestPlan.UnitIds.Contains(person.UnitId) && (getTestPlan.WorkPostIds == null || getTestPlan.WorkPostIds.Contains(person.WorkPostId)))
{
//0-待提交；1-已发布未考试 将人员添加进考试记录
var testTRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TestManId == person.PersonId);
if ((getTestPlan.States == "0" || getTestPlan.States == "1") && testTRecord == null && !string.IsNullOrEmpty(personId))
{
Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord
{
TestRecordId = SQLHelper.GetNewID(),
ProjectId = getTestPlan.ProjectId,
TestPlanId = getTestPlan.TestPlanId,
TestManId = personId,
};
TestRecordService.AddTestRecordForApi(newTestRecord);
responeData.code = 3;
responeData.message = "您已加入考试计划！";
}
}
if (user != null && string.IsNullOrEmpty(getTestPlan.PlanId) && getTestPlan.UnitIds.Contains(user.UnitId) && (getTestPlan.DepartIds == null || getTestPlan.DepartIds.Contains(user.DepartId)))
{
//0-待提交；1-已发布未考试 将人员添加进考试记录
var testTRecord = db.Training_TestRecord.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TestManId == personId);
if ((getTestPlan.States == "0" || getTestPlan.States == "1") && testTRecord == null && !string.IsNullOrEmpty(personId))
{
Model.Training_TestRecord newTestRecord = new Model.Training_TestRecord
{
TestRecordId = SQLHelper.GetNewID(),
ProjectId = getTestPlan.ProjectId,
TestPlanId = getTestPlan.TestPlanId,
TestManId = personId,
};
TestRecordService.AddTestRecordForApi(newTestRecord);
responeData.code = 3;
responeData.message = "您已加入考试计划！";
}
}
}
}
}
}
}
if (responeData.code == 1)
@@ -353,83 +292,6 @@ namespace WebAPI.Controllers
}
#endregion
public Model.ResponeData getTrainingPlanTestRecordItemByTestPlanIdPersonId(string companyTrainingItemCode, string personId, string projectId)
{
var responeData = new Model.ResponeData();
try
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var getCompanyTraining = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemCode == companyTrainingItemCode);
if (getCompanyTraining != null)
{
var user = db.Sys_User.FirstOrDefault(x => x.UserId == personId);
Model.SitePerson_Person person;
if (user != null)
{
person = db.SitePerson_Person.FirstOrDefault(e => (e.PersonId == personId || e.IdentityCard == user.IdentityCard) && e.ProjectId == projectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
}
else
{
person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId && e.ProjectId == projectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
}
if (person != null || user != null)
{
var testRecord = db.Training_TestRecord.FirstOrDefault(x => x.CompanyTrainingItemId == getCompanyTraining.CompanyTrainingItemId && x.TestManId == personId && !x.TestEndTime.HasValue);
if (testRecord != null)
{
string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, testRecord.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
}
else if (person != null)
{
var testRecord2 = db.Training_TestRecord.FirstOrDefault(x => x.CompanyTrainingItemId == getCompanyTraining.CompanyTrainingItemId && x.TestManId == person.PersonId && !x.TestEndTime.HasValue);
if (testRecord2 != null)
{
string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, testRecord2.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
}
else
{
Model.Training_TestRecord training_TestRecord = new Model.Training_TestRecord();
training_TestRecord.TestRecordId = Guid.NewGuid().ToString();
training_TestRecord.ProjectId = projectId;
training_TestRecord.CompanyTrainingItemId = getCompanyTraining.CompanyTrainingItemId;
training_TestRecord.TestManId = person.PersonId;
db.Training_TestRecord.InsertOnSubmit(training_TestRecord);
db.SubmitChanges();
string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, training_TestRecord.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
}
}
else
{
Model.Training_TestRecord training_TestRecord = new Model.Training_TestRecord();
training_TestRecord.TestRecordId = Guid.NewGuid().ToString();
training_TestRecord.ProjectId = projectId;
training_TestRecord.CompanyTrainingItemId = getCompanyTraining.CompanyTrainingItemId;
training_TestRecord.TestManId = user.UserId;
db.Training_TestRecord.InsertOnSubmit(training_TestRecord);
db.SubmitChanges();
string testRecordId = APITestRecordService.CreateTestRecordItem(getCompanyTraining, training_TestRecord.TestRecordId, person, user);
responeData.code = 2;
responeData.data = new { testRecordId };
}
}
}
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
+50 -269
View File
@@ -1,15 +1,10 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using BLL;
using Model;
namespace WebAPI.Controllers
{
/// <summary>
@@ -223,33 +218,18 @@ namespace WebAPI.Controllers
/// <param name="strPass">0-未通过；1通过；空所有</param>
/// <param name="pageIndex">页码</param>
/// <returns>考试记录列表</returns>
public Model.ResponeData getTrainingTestRecordListQuery(string projectId, string unitId, string workPostId, string departId, string strPass, int pageIndex)
public Model.ResponeData getTrainingTestRecordListQuery(string projectId, string unitId, string workPostId, string strPass, int pageIndex)
{
var responeData = new Model.ResponeData();
try
{
if (!string.IsNullOrEmpty(departId))
var getDataLists = APITestRecordService.getTrainingTestRecordListByProjectId(projectId, unitId, workPostId, strPass, string.Empty);
int pageCount = getDataLists.Count;
if (pageCount > 0 && pageIndex > 0)
{
var getDataLists = APITestRecordService.getTrainingTestRecordListByDepartId(unitId, departId, strPass, string.Empty);
int pageCount = getDataLists.Count;
if (pageCount > 0 && pageIndex > 0)
{
getDataLists = getDataLists.OrderByDescending(x => x.TestStartTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
}
responeData.data = new { pageCount, getDataLists };
}
else
{
var getDataLists = APITestRecordService.getTrainingTestRecordListByProjectId(projectId, unitId, workPostId, strPass, string.Empty);
int pageCount = getDataLists.Count;
if (pageCount > 0 && pageIndex > 0)
{
getDataLists = getDataLists.OrderByDescending(x => x.TestStartTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
}
responeData.data = new { pageCount, getDataLists };
getDataLists = getDataLists.OrderByDescending(x => x.TestStartTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
}
responeData.data = new { pageCount, getDataLists };
}
catch (Exception ex)
{
@@ -260,6 +240,38 @@ namespace WebAPI.Controllers
}
#endregion
#region 根据ProjectId获取所有考试记录列表
/// <summary>
/// 根据ProjectId获取所有考试记录列表
/// </summary>
/// <param name="projectId">项目ID</param>
/// <param name="unitId">单位ID</param>
/// <param name="workPostId">岗位ID</param>
/// <param name="strPass">0-未通过；1通过；空所有</param>
/// <param name="strParam">参数</param>
/// <param name="pageIndex">页码</param>
/// <returns>考试记录列表</returns>
public Model.ResponeData getTrainingTestRecordListQuery(string projectId, string unitId, string workPostId, string strPass,string strParam, int pageIndex)
{
var responeData = new Model.ResponeData();
try
{
var getDataLists = APITestRecordService.getTrainingTestRecordListByProjectId(projectId, unitId, workPostId, strPass, strParam);
int pageCount = getDataLists.Count;
if (pageCount > 0 && pageIndex > 0)
{
getDataLists = getDataLists.OrderByDescending(x => x.TestStartTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
}
responeData.data = new { pageCount, getDataLists };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据TestRecordItemId、selectedItem 考生答题
/// <summary>
@@ -272,129 +284,25 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
if (!string.IsNullOrEmpty(testRecordItemId) && !string.IsNullOrEmpty(selectedItem))
var getItem = TestRecordItemService.GetTestRecordItemTestRecordItemId(testRecordItemId);
if (getItem != null)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
//更新没有结束时间且超时的考试记录
int closeCount = TestRecordService.UpdateTestEndTimeNull(getItem.TestRecordId);
if (closeCount > 0)
{
var getTItem = db.Training_TestRecordItem.FirstOrDefault(x => x.TestRecordItemId == testRecordItemId);
if (getTItem != null)
{
getTItem.SubjectScore = 0;
getTItem.SelectedItem = selectedItem;
if (!string.IsNullOrEmpty(selectedItem))
{
if (getTItem.AnswerItems == selectedItem)
{
getTItem.SubjectScore = getTItem.Score ?? 0;
}
else
{
var listA = Funs.GetStrListByStr(getTItem.AnswerItems.ToUpper(), ',');
var listS = Funs.GetStrListByStr(selectedItem.ToUpper(), ',');
if (getTItem.TestType == "2" && listA.Count >= listS.Count)
{
int i = 0;
foreach (var item in listS)
{
if (!listA.Contains(item))
{
i++;
break;
}
}
if (i == 0)
{
if (listA.Count == listS.Count)
{
getTItem.SubjectScore = getTItem.Score ?? 0;
}
else
{
getTItem.SubjectScore = Convert.ToDecimal((getTItem.Score ?? 0) * 1.0 / 2);
}
}
}
}
}
db.SubmitChanges();
}
responeData.code = 2;
responeData.message = "本次考试已结束，系统自动交卷！";
}
else
{
APITestRecordService.getTestRecordItemAnswerBySelectedItem(getItem, selectedItem);
}
}
else
{
responeData.code = 0;
responeData.message = "答题为空选项！";
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
public Model.ResponeData getTestRecordItemAnswerBySelectedItem(string testRecordId, string testRecordItemId, string selectedItem)
{
var responeData = new Model.ResponeData();
try
{
if (!string.IsNullOrEmpty(testRecordId) && !string.IsNullOrEmpty(testRecordItemId) && !string.IsNullOrEmpty(selectedItem))
{
BLL.RedisHelper redis = new RedisHelper();
var trainingTestRecordItems = redis.GetObjString<List<Training_TestRecordItem>>(testRecordId); //根据试卷ID获取试卷题目列表
var getTItem = trainingTestRecordItems?.FirstOrDefault(x => x.TestRecordItemId == testRecordItemId); //获取试题
if (getTItem == null)
{
responeData.code = 0;
responeData.message = "答题为空选项！";
return responeData;
}
getTItem.SubjectScore = 0;
getTItem.SelectedItem = selectedItem;
if (!string.IsNullOrEmpty(selectedItem))
{
if (getTItem.AnswerItems == selectedItem)
{
getTItem.SubjectScore = getTItem.Score ?? 0;
}
else
{
var listA = Funs.GetStrListByStr(getTItem.AnswerItems.ToUpper(), ',');
var listS = Funs.GetStrListByStr(selectedItem.ToUpper(), ',');
if (getTItem.TestType == "2" && listA.Count >= listS.Count)
{
int i = 0;
foreach (var item in listS)
{
if (!listA.Contains(item))
{
i++;
break;
}
}
if (i == 0)
{
if (listA.Count == listS.Count)
{
getTItem.SubjectScore = getTItem.Score ?? 0;
}
else
{
getTItem.SubjectScore = Convert.ToDecimal((getTItem.Score ?? 0) * 1.0 / 2);
}
}
}
}
}
redis.SetObjString(testRecordId, getTItem);
}
else
{
responeData.code = 0;
responeData.message = "参数不足！";
return responeData;
responeData.message = "试题有问题！";
}
}
catch (Exception ex)
@@ -458,132 +366,5 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
#region 交卷
/// <summary>
/// 交卷
/// </summary>
public Model.ResponeData SaveSubmitTestRecordByTestRecordId(Model.TestRecordItem testRecordItem)
{
string testRecordId = testRecordItem.TestRecordId;
string Signature = testRecordItem.Signature;
string Fingerprint = testRecordItem.Fingerprint;
var responeData = new Model.ResponeData();
try
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
#region 将答题记录保存到数据库
RedisHelper redis = new RedisHelper();
var trainingTestRecordItems = redis.GetObjString<List<Training_TestRecordItem>>(testRecordId);
if (trainingTestRecordItems != null)
{
var modeltestRecordItem = from x in db.Training_TestRecordItem
where x.TestRecordId == testRecordId
select x;
if (modeltestRecordItem.Any())
{
db.Training_TestRecordItem.DeleteAllOnSubmit(modeltestRecordItem);
db.SubmitChanges();
}
db.Training_TestRecordItem.InsertAllOnSubmit(trainingTestRecordItems);
}
#endregion
var getTestRecord = db.Training_TestRecord.FirstOrDefault(e => e.TestRecordId == testRecordId);
if (getTestRecord != null)
{
string rootUrl = ConfigurationManager.AppSettings["localRoot"];
string SignatureUrl = @"FileUpload\TestRecord\" + getTestRecord.TestRecordId + "~签名" + ".png";
string FingerprintUrl = @"FileUpload\TestRecord\" + getTestRecord.TestRecordId + "~指纹" + ".png";
string Signaturefilename = rootUrl + SignatureUrl;
string Fingerprintfilename = rootUrl + FingerprintUrl;
if (!string.IsNullOrEmpty(Signature))
{
Signature = Signature.Replace("data:image/svg+xml;base64,", "").Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换
byte[] bytes = Convert.FromBase64String(Signature);
MemoryStream memStream = new MemoryStream(bytes);
Image mImage = Image.FromStream(memStream);
Bitmap bp = new Bitmap(mImage);
MemoryStream ms = new MemoryStream();
bp.Save(Signaturefilename, System.Drawing.Imaging.ImageFormat.Png);
// System.IO.File.WriteAllBytes(Signaturefilename, Convert.FromBase64String(Signature));
getTestRecord.Signature = Signaturefilename.Replace(rootUrl, "");
}
if (!string.IsNullOrEmpty(Fingerprint))
{
Fingerprint = Fingerprint.Replace("data:image/svg+xml;base64,", "").Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换
byte[] bytes = Convert.FromBase64String(Fingerprint);
MemoryStream memStream = new MemoryStream(bytes);
Image mImage = Image.FromStream(memStream);
Bitmap bp = new Bitmap(mImage);
MemoryStream ms = new MemoryStream();
bp.Save(Fingerprintfilename, System.Drawing.Imaging.ImageFormat.Png);
getTestRecord.Fingerprint = Fingerprintfilename.Replace(rootUrl, "");
}
db.SubmitChanges();
// APITestRecordService.updateTestRecord(getTestRecord);
string returnTestRecordId = string.Empty;
////考试分数
decimal getTestScores = APITestRecordService.getSubmitTestRecord(getTestRecord);
if (!string.IsNullOrEmpty(getTestRecord.TestPlanId))
{ ////及格分数
int getPassScores = 80;
var testRule = db.Sys_TestRule.FirstOrDefault();
if (testRule != null)
{
getPassScores = testRule.PassingScore;
}
if (getTestScores <= getPassScores)
{
int testCount = db.Training_TestRecord.Where(x => x.TestPlanId == getTestRecord.TestPlanId && x.TestManId == getTestRecord.TestManId).Count();
if (testCount < 2)
{
////重新生成一条考试记录 以及考试试卷
returnTestRecordId = APITestRecordService.getResitTestRecord(getTestRecord);
responeData.message = "考试不合格！您的成绩为：【" + getTestScores.ToString() + "】，您将进入补考。";
}
else
{
APITestRecordService.updateAll(getTestRecord.TestPlanId);
responeData.message = "考试不合格！您的成绩为：【" + getTestScores.ToString() + "】，请再次参加培训后补考。";
}
}
else
{
APITestRecordService.updateAll(getTestRecord.TestPlanId);
responeData.message = "恭喜考试通过！您的成绩为：【" + getTestScores.ToString() + "】。";
}
responeData.data = new { getTestScores, getPassScores, returnTestRecordId };
}
else
{
responeData.data = new { getTestScores };
}
}
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}
SGGL/WebAPI/Controllers/PersonController.cs
+7 -22
View File
@@ -352,33 +352,18 @@ namespace WebAPI.Controllers
/// <param name="trainTypeId">培训类型ID(可为空)</param>
/// <param name="pageIndex">分页</param>
/// <returns></returns>
public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex, string departIds="", string strParam="", string InTime="")
public Model.ResponeData getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, int pageIndex)
{
var responeData = new Model.ResponeData();
try
{
if (string.IsNullOrEmpty(projectId))
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, trainTypeId).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
{
var getDataList = APIPersonService.getTrainingPersonListByDepartAndTrainTypeId(unitIds, departIds, trainTypeId).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
{
getDataList = getDataList.OrderBy(u => u.UnitName).ThenBy(u => u.PersonName).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList(); ////200 ->Funs.PageSize
}
responeData.data = new { pageCount, getDataList };
getDataList = getDataList.OrderBy(u => u.UnitName).ThenBy(u => u.PersonName).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList(); ////200 ->Funs.PageSize
}
else
{
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(projectId, unitIds, workPostIds, departIds, trainTypeId, InTime, strParam).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
{
getDataList = getDataList.OrderBy(u => u.UnitName).ThenBy(u => u.PersonName).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList(); ////200 ->Funs.PageSize
}
responeData.data = new { pageCount, getDataList };
}
responeData.data = new { pageCount, getDataList };
}
catch (Exception ex)
{
@@ -1141,6 +1126,6 @@ namespace WebAPI.Controllers
#endregion
}
}
SGGL/WebAPI/Controllers/UserController.cs
+1 -1
View File
@@ -145,7 +145,7 @@ namespace WebAPI.Controllers
db.SubmitChanges();
// FormsAuthentication.SetAuthCookie(person.PersonId, true, FormsAuthentication.FormsCookiePath);
FormsAuthenticationTicket Tick = new FormsAuthenticationTicket(1,
person.PersonName,
sysUser.Account,
DateTime.Now,
DateTime.Now.AddYears(10), //十年有效期
false,