chenguoping
/
gyhlw_dotnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

时效型修改，成绩菜单修改

This commit is contained in:
cgp 2025-11-13 11:26:02 +08:00
parent 261ae86131
commit 07c779c020
4 changed files with 201 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
网站项目/VRS/Handler/Config.ashx.cs
View File

@ -171,7 +171,8 @@ namespace VRS.Handler
var score = context.Request.Params["score"];
DateTime dt = DateTime.Now;
var config = bll_exam_result_match_record.GetModelList(string.Format(" user_id = '{0}' and start_time<'{1}' and expire_time>'{1}' ", user_id, dt)).FirstOrDefault();
//var config = bll_exam_result_match_record.GetModelList(string.Format(" user_id = '{0}' and start_time<'{1}' and expire_time>'{1}' ", user_id, dt)).FirstOrDefault();
var config = bll_exam_result_match_record.GetModelList(string.Format(" user_id = '{0}' ", user_id)).FirstOrDefault();
var obj = new DataService.Model.breakpoint_continuation();
obj.id = BasePage.GetId();
@ -201,10 +202,10 @@ namespace VRS.Handler
}
/// <summary>
/// 比赛是否失效
/// 比赛是否失效 init 初始
/// </summary>
/// <param name="context"></param>
private void MatchRecord(HttpContext context)
private void MatchRecord_old(HttpContext context)
{
var ret = string.Empty;
DateTime dt = DateTime.Now;
@ -287,6 +288,186 @@ namespace VRS.Handler
}
}
/// <summary>
/// 比赛是否失效 微调版
/// </summary>
/// <param name="context"></param>
private void MatchRecord(HttpContext context)
{
var ret = string.Empty;
DateTime dt = DateTime.Now;
//string sql = string.Format(" 1=1 and start_time<'{0}' and expire_time>'{0}' ", dt);
//string sql = string.Format(" 1=1 and start_time<'{0}' ", dt);
string sql = string.Format(" 1=1 ");
string sql2 = " 1=1 ";
var user_id = context.Request.Params["user_id"];
if (string.IsNullOrEmpty(user_id))
{
ret = GetResult(false, "user_id参数不能为空");
context.Response.Write(ret);
context.Response.End();
}
else
{
sql += string.Format(" and user_id='{0}' ", user_id);
}
var type = context.Request.Params["type"];
if (string.IsNullOrEmpty(type))
{
//ret = GetResult(false, "type参数不能为空");
//context.Response.Write(ret);
//context.Response.End();
}
else
{
sql2 += string.Format(" and type='{0}' ", type);
}
var step = context.Request.Params["step"];
if (string.IsNullOrEmpty(step))
{
//ret = GetResult(false, "step参数不能为空");
//context.Response.Write(ret);
//context.Response.End();
}
else
{
sql2 += string.Format(" and step='{0}' ", step);
}
var device_id = context.Request.Params["device_id"];
if (!string.IsNullOrEmpty(device_id))
{
sql2 += string.Format(" and device_id='{0}' ", device_id);
}
var config = bll_exam_result_match_record.GetModelList(sql).FirstOrDefault();
if (null != config)
{
sql2 += string.Format(" and user_id = '{0}' and record_id='{1}' order by record_time desc ", user_id, config.id);
List<breakpoint_continuation> break_list = new List<breakpoint_continuation>();
break_list = bll_breakpoint_continuation.GetModelList(sql2);
if (break_list.Count > 0)
{
var result = GetResult(true, break_list.Select(x => x.data).FirstOrDefault(), "true");
context.Response.Write(result);
context.Response.End();
}
else
{
var result = GetResult(true, "", "false");
context.Response.Write(result);
context.Response.End();
}
}
else
{
var datetime = DateTime.Now;
var obj = new DataService.Model.exam_result_match_record();
obj.id = BasePage.GetId();
obj.user_id = user_id;
obj.start_time = datetime;
//obj.expire_time = datetime.AddDays(1);
obj.expire_time = DateTime.MaxValue;
bool add_flag = bll_exam_result_match_record.Add(obj);
var result = GetResult(true, "", "false");
context.Response.Write(result);
context.Response.End();
}
}
/// <summary>
/// 比赛是否失效
/// </summary>
/// <param name="context"></param>
private void MatchRecord_1(HttpContext context)
{
var ret = string.Empty;
DateTime dt = DateTime.Now;
string sql = string.Format(" 1=1 ");
string sql2 = " 1=1 ";
var user_id = context.Request.Params["user_id"];
if (string.IsNullOrEmpty(user_id))
{
ret = GetResult(false, "user_id参数不能为空");
context.Response.Write(ret);
context.Response.End();
}
else
{
sql += string.Format(" and user_id='{0}' ", user_id);
}
var type = context.Request.Params["type"];
if (string.IsNullOrEmpty(type))
{
//ret = GetResult(false, "type参数不能为空");
//context.Response.Write(ret);
//context.Response.End();
}
else
{
sql2 += string.Format(" and type='{0}' ", type);
}
var step = context.Request.Params["step"];
if (string.IsNullOrEmpty(step))
{
//ret = GetResult(false, "step参数不能为空");
//context.Response.Write(ret);
//context.Response.End();
}
else
{
sql2 += string.Format(" and step='{0}' ", step);
}
var device_id = context.Request.Params["device_id"];
if (!string.IsNullOrEmpty(device_id))
{
sql2 += string.Format(" and device_id='{0}' ", device_id);
}
//var config = bll_exam_result_match_record.GetModelList(sql).FirstOrDefault();
if (true)
{
//sql2 += string.Format(" and user_id = '{0}' and record_id='{1}' order by record_time desc ", user_id, config.id);
sql2 += string.Format(" and user_id = '{0}' order by record_time desc ", user_id);
List<breakpoint_continuation> break_list = new List<breakpoint_continuation>();
break_list = bll_breakpoint_continuation.GetModelList(sql2);
if (break_list.Count > 0)
{
var result = GetResult(true, break_list.Select(x => x.data).FirstOrDefault(), "true");
//var temp = break_list.FirstOrDefault();
//var result = GetResult(true, temp.data, "true");
context.Response.Write(result);
context.Response.End();
}
else
{
var result = GetResult(true, "", "false");
context.Response.Write(result);
context.Response.End();
}
}
else
{
var datetime = DateTime.Now;
var obj = new DataService.Model.exam_result_match_record();
obj.id = BasePage.GetId();
obj.user_id = user_id;
obj.start_time = datetime;
obj.expire_time = datetime.AddDays(1);
bool add_flag = bll_exam_result_match_record.Add(obj);
var result = GetResult(true, "", "false");
context.Response.Write(result);
context.Response.End();
}
}
/// <summary>
/// 断点查询
/// </summary>

16
网站项目/VRS/Management/Home.aspx
View File

@ -50,19 +50,19 @@
<a href="javascript:void(0)"><i class="mdi mdi-camera-metering-matrix"></i>成绩查询</a>
<ul class="nav nav-subnav">
<li class="nav-item"><a class="multitabs" href="Exam/ResultQuery.aspx?Id=1"><i class="mdi mdi-camera-metering-spot"></i>实训成绩</a> </li>
<%--<li class="nav-item"><a class="multitabs" href="Exam/ResultQuery.aspx?Id=0"><i class="mdi mdi-camera-metering-center"></i>考试成绩</a> </li>--%>
<li class="nav-item"><a class="multitabs" href="Exam/ResultQuery.aspx?Id=0"><i class="mdi mdi-camera-metering-center"></i>三维考试</a> </li>
<li class="nav-item"><a class="multitabs" href="VSAT/ResultQueryExamBatch.aspx?lianxi=1"><i class="mdi mdi-camera-metering-center"></i>考试成绩</a> </li>
</ul>
</li>
<%--<li class="nav-item show"><a class="multitabs" href="Exam/ResultQueryMatch.aspx"><i class="mdi mdi-home-automation"></i>竞赛考核</a> </li>--%>
<li class="nav-item nav-item-has-subnav">
<a href="javascript:void(0)"><i class="mdi mdi-format-line-weight"></i>竞赛考核</a>
<ul class="nav nav-subnav">
<li class="nav-item" runat="server" id="li_theory_query"><a class="multitabs" href="VSAT/ResultQueryExamBatch.aspx"><i class="mdi mdi-camera-metering-center"></i>理论考核</a> </li>
<li class="nav-item"><a class="multitabs" href="Exam/ResultQueryMatch.aspx"><i class="mdi mdi-format-list-bulleted-type"></i>实操考核</a> </li>
</ul>
</li>
<li class="nav-item nav-item-has-subnav">
<a href="javascript:void(0)"><i class="mdi mdi-format-line-weight"></i>竞赛考核</a>
<ul class="nav nav-subnav">
<li class="nav-item" runat="server" id="li_theory_query"><a class="multitabs" href="VSAT/ResultQueryExamBatch.aspx"><i class="mdi mdi-camera-metering-center"></i>理论考核</a> </li>
<li class="nav-item"><a class="multitabs" href="Exam/ResultQueryMatch.aspx"><i class="mdi mdi-format-list-bulleted-type"></i>实操考核</a> </li>
</ul>
</li>
<li class="nav-item nav-item-has-subnav" runat="server" id="li_theory_manager">
<a href="javascript:void(0)"><i class="mdi mdi-locker-multiple"></i>考试管理</a>

8
网站项目/VRS/Model/Achievement.cs
View File

@ -168,6 +168,10 @@ public class CHGYWGYx
public string cjdpz_dxsx { get; set; }
public string cjdpz_scms { get; set; }
/// <summary>
/// 2025-02-28 added
/// </summary>
//public string mqtt_qiyong { get; set; }
public string mqtt_ip { get; set; }
public string mqtt_wgsn { get; set; }
@ -223,6 +227,10 @@ public class CHGYWGWx
public string cjdpz_dxsx { get; set; }
public string cjdpz_scms { get; set; }
/// <summary>
/// 2025-02-28 added
/// </summary>
//public string mqtt_qiyong { get; set; }
public string mqtt_ip { get; set; }
public string mqtt_wgsn { get; set; }

2
网站项目/VRS/VRS.csproj
View File

@ -2321,7 +2321,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>52524</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:53000/</IISUrl>
<IISUrl>http://localhost:53088/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>