Skip to content

E
EduSpider
Commit 64d3d841 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 6540d2da
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 49 deletions
EduSpider.IRepository/IExam_ScoreRepository.cs
View file @ 64d3d841
using EduSpider.Model.Entity;
using EduSpider.Model.Extend;
<<<<<<< .merge_file_a14452
using EduSpider.Model.Query;
=======
>>>>>>> .merge_file_a12592
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VTX.FW.Config;
using VTX.FW.DB;
......
EduSpider.Repository/Exam_ScoreRepository.cs
View file @ 64d3d841
using EduSpider.Model.Entity;
using EduSpider.Model.Extend;
<<<<<<< HEAD
using EduSpider.Model.Query;
=======
>>>>>>> 6d0347e0f3f9e8ee506c9ab8673669368baa27d7
using EduSpider.Repository.Base;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EduSpider.Repository
{
......@@ -26,7 +21,7 @@ namespace EduSpider.Repository
/// <returns></returns>
public List<RB_Exam_Score_Extend> GetExamScoreListRepository(CourseQuery query)
{
StringBuilder builder = new StringBuilder();
StringBuilder builder = new();
builder.AppendFormat(@"
SELECT A.*,B.ExamName,B.CreateTime AS ExamCreateTime
FROM RB_Exam_Score AS A INNER JOIN rb_exam AS B ON A.ExamId=B.ExamId
......
EduSpider.Services/ExamService.cs
View file @ 64d3d841
......@@ -23,27 +23,27 @@ namespace EduSpider.Services
/// 帐号仓储接口
/// </summary>
[Autowired]
private IAccountRepository accountRepository { get; set; }
private IAccountRepository AccountRepository { get; set; }
/// <summary>
/// 考试
/// </summary>
[Autowired]
private IExamRepository examRepository { get; set; }
private IExamRepository ExamRepository { get; set; }
/// <summary>
/// 考试题目
/// </summary>
[Autowired]
private IExam_QuestionsRepository exam_QuestionsRepository { get; set; }
private IExam_QuestionsRepository Exam_QuestionsRepository { get; set; }
/// <summary>
/// 考试得分
/// </summary>
[Autowired]
private IExam_ScoreRepository exam_ScoreRepository { get; set; }
private IExam_ScoreRepository Exam_ScoreRepository { get; set; }
/// <summary>
/// 学生
/// </summary>
[Autowired]
private IStudentRepository studentRepository { get; set; }
private IStudentRepository StudentRepository { get; set; }
/// <summary>
/// 获取考试分页列表
......@@ -55,7 +55,7 @@ namespace EduSpider.Services
/// <returns></returns>
public List<RB_Exam_Extend> GetExamPageList(int pageIndex, int pageSize, out long count, RB_Exam_Extend demodel)
{
return examRepository.GetExamPageList(pageIndex, pageSize, out count, demodel);
return ExamRepository.GetExamPageList(pageIndex, pageSize, out count, demodel);
}
/// <summary>
......@@ -66,14 +66,14 @@ namespace EduSpider.Services
/// <returns></returns>
public object GetExamStuScoreInfo(int examId, int stuId)
{
var stuModel = studentRepository.GetEntity(stuId);
var stuModel = StudentRepository.GetEntity(stuId);
if (stuModel == null) { return ""; }
var examModel = examRepository.GetEntity(examId);
var examModel = ExamRepository.GetEntity(examId);
if (examModel == null) { return ""; }
//考试题目
var qlist = exam_QuestionsRepository.GetList(new RB_Exam_Questions_Extend() { ExamId = examId });
var qlist = Exam_QuestionsRepository.GetList(new RB_Exam_Questions_Extend() { ExamId = examId });
//考试成绩
var sExamModel = exam_ScoreRepository.GetList(new RB_Exam_Score_Extend() { ExamId = examId, StuId = stuId }).FirstOrDefault();
var sExamModel = Exam_ScoreRepository.GetList(new RB_Exam_Score_Extend() { ExamId = examId, StuId = stuId }).FirstOrDefault();
if (sExamModel != null) {
sExamModel.ScoreList = JsonHelper.Deserialize<List<ExamQScoreModel>>(sExamModel.Content);
foreach (var qitem in sExamModel.ScoreList) {
......@@ -90,7 +90,7 @@ namespace EduSpider.Services
{
StuId = stuModel.StudId,
StuName = stuModel.StudentName,
ExamName = examModel.ExamName,
examModel.ExamName,
sExamModel?.TScore,
sExamModel?.Rank,
sExamModel?.RankRate,
......@@ -137,7 +137,7 @@ namespace EduSpider.Services
/// <returns></returns>
public string ImportExcelForStuExamScore(string path_server,int courseId, string examName, int userId)
{
var umodel = accountRepository.GetAccountList(new Model.Extend.RB_Account_Extend() { Id = userId }).FirstOrDefault();
var umodel = AccountRepository.GetAccountList(new Model.Extend.RB_Account_Extend() { Id = userId }).FirstOrDefault();
if (umodel == null || umodel.Status == Utility.Enum.DateStateEnum.Delete || umodel.AccountType != Utility.Enum.AccountTypeEnum.Teacher) { return "没有权限操作"; }
var EQlist = StuExamScoreHelper.GetStuExamScoreData(path_server, out List<StuScoreModel> StuList);
if (EQlist.Any())
......@@ -146,10 +146,10 @@ namespace EduSpider.Services
StuList = StuList.Where(x => x.Name != "平均分" && !string.IsNullOrWhiteSpace(x.Name)).ToList();
//根据学生姓名 查询所有的学生账号
string StuNames = "'" + string.Join("','", StuList.Select(x => x.Name).Distinct()) + "'";
var sList = studentRepository.GetListForStuName(StuNames);
var sList = StudentRepository.GetListForStuName(StuNames);
//插入考试
int ExamId = examRepository.Insert(new Model.Entity.RB_Exam()
int ExamId = ExamRepository.Insert(new Model.Entity.RB_Exam()
{
ExamId = 0,
CourseId = courseId,
......@@ -174,7 +174,7 @@ namespace EduSpider.Services
Sort = item.Id
});
}
exam_QuestionsRepository.BatchInsert(InsertEQ);
Exam_QuestionsRepository.BatchInsert(InsertEQ);
decimal ExamScore = InsertEQ.Sum(x => x.Score);
List<Model.Entity.RB_Exam_Score> InsertScore = new();
......@@ -201,7 +201,7 @@ namespace EduSpider.Services
});
}
//InsertScore = InsertScore.Where(x => x.StuId > 0).ToList();//暂时只插入匹配到学生的
exam_ScoreRepository.BatchInsert(InsertScore);
Exam_ScoreRepository.BatchInsert(InsertScore);
}
return "";
......@@ -222,7 +222,7 @@ namespace EduSpider.Services
/// <returns></returns>
public string ImportExcelForStuExamScore_V2(string path_server, int courseId, string examName, int userId)
{
var umodel = accountRepository.GetAccountList(new Model.Extend.RB_Account_Extend() { Id = userId }).FirstOrDefault();
var umodel = AccountRepository.GetAccountList(new Model.Extend.RB_Account_Extend() { Id = userId }).FirstOrDefault();
if (umodel == null || umodel.Status == Utility.Enum.DateStateEnum.Delete || umodel.AccountType != Utility.Enum.AccountTypeEnum.Teacher) { return "没有权限操作"; }
var EQlist = StuExamScoreHelper.GetStuExamScoreData(path_server, out List<StuScoreModel> StuList);
if (EQlist.Any())
......@@ -231,10 +231,10 @@ namespace EduSpider.Services
StuList = StuList.Where(x => x.Name != "平均分" && !string.IsNullOrWhiteSpace(x.Name)).ToList();
//根据学生姓名 查询所有的学生账号
string StuNames = "'" + string.Join("','", StuList.Select(x => x.Name).Distinct()) + "'";
var sList = studentRepository.GetListForStuName(StuNames);
var sList = StudentRepository.GetListForStuName(StuNames);
//插入考试
int ExamId = examRepository.Insert(new Model.Entity.RB_Exam()
int ExamId = ExamRepository.Insert(new Model.Entity.RB_Exam()
{
ExamId = 0,
CourseId = courseId,
......@@ -260,7 +260,7 @@ namespace EduSpider.Services
Sort = item.Id
});
}
exam_QuestionsRepository.BatchInsert(InsertEQ);
Exam_QuestionsRepository.BatchInsert(InsertEQ);
List<Model.Entity.RB_Exam_Score> InsertScore = new();
//开始插入得分
......@@ -277,7 +277,7 @@ namespace EduSpider.Services
StuName = item.Name
});
}
exam_ScoreRepository.BatchInsert(InsertScore);
Exam_ScoreRepository.BatchInsert(InsertScore);
}
return "";
......
EduSpider.WebApi/Controllers/Student/ExamController.cs
View file @ 64d3d841
......@@ -20,7 +20,7 @@ namespace EduSpider.WebApi.Controllers
/// 考试
/// </summary>
[Autowired]
public IExamService examService { get; set; }
public IExamService ExamService { get; set; }
/// <summary>
/// 获取考试分页列表
......@@ -32,7 +32,7 @@ namespace EduSpider.WebApi.Controllers
ResultPageModel pmodel = JsonHelper.Deserialize<ResultPageModel>(RequestParm.Msg.ToString());
RB_Exam_Extend demodel = JsonHelper.Deserialize<RB_Exam_Extend>(RequestParm.Msg.ToString());
var list = examService.GetExamPageList(pmodel.PageIndex, pmodel.PageSize, out long count, demodel);
var list = ExamService.GetExamPageList(pmodel.PageIndex, pmodel.PageSize, out long count, demodel);
pmodel.RowsCount = count;
pmodel.PageData = list.Select(x => new
{
......@@ -69,7 +69,7 @@ namespace EduSpider.WebApi.Controllers
return ApiResult.ParamIsNull();
}
var robj = examService.GetExamStuScoreInfo(ExamId, StuId);
var robj = ExamService.GetExamStuScoreInfo(ExamId, StuId);
return ApiResult.Success("", robj);
}
......
EduSpider.WebApi/Controllers/Upload/UploadController.cs
View file @ 64d3d841
......@@ -32,7 +32,7 @@ namespace EduSpider.WebApi.Controllers
/// 考试
/// </summary>
[Autowired]
public IExamService examService { get; set; }
public IExamService ExamService { get; set; }
/// <summary>
......@@ -89,7 +89,7 @@ namespace EduSpider.WebApi.Controllers
}
#region 解析文档数据并保存
string rmsg = examService.ImportExcelForStuExamScore(path_server, CourseId, ExamName, UserId);
string rmsg = ExamService.ImportExcelForStuExamScore(path_server, CourseId, ExamName, UserId);
if (rmsg == "")
{
return ApiResult.Success();
......@@ -121,7 +121,7 @@ namespace EduSpider.WebApi.Controllers
string path_server = "C:/Users/Administrator/Desktop/TempFile/化学成绩查询表.xlsx";
#region 解析文档数据并保存
string rmsg = examService.ImportExcelForStuExamScore(path_server, 44977497, "测试考试化学2", 11759328);
string rmsg = ExamService.ImportExcelForStuExamScore(path_server, 44977497, "测试考试化学2", 11759328);
if (rmsg == "")
{
return ApiResult.Success();
......
EduSpider.WebApi/Controllers/User/LoginController.cs
View file @ 64d3d841
......@@ -28,7 +28,7 @@ namespace EduSpider.WebApi.Controllers
/// 账号仓储接口
/// </summary>
[Autowired]
public IAccountService accountService { get; set; }
public IAccountService AccountService { get; set; }
#region 账号密码登录
/// <summary>
......@@ -46,7 +46,7 @@ namespace EduSpider.WebApi.Controllers
string UnionId = jobj.GetString("UnionId");
string OpenId = jobj.GetString("OpenId");
var model = accountService.GetAccountList(new RB_Account_Extend()
var model = AccountService.GetAccountList(new RB_Account_Extend()
{
Account = account.Trim()
}).FirstOrDefault();
......@@ -68,7 +68,7 @@ namespace EduSpider.WebApi.Controllers
{
model.UnionId = UnionId;
model.OpenId = OpenId;
accountService.UpdateAccountUnionId(model);
AccountService.UpdateAccountUnionId(model);
}
if (model.Status == Utility.Enum.DateStateEnum.Delete)
{
......@@ -117,7 +117,7 @@ namespace EduSpider.WebApi.Controllers
{
return ApiResult.Failed(message: "手机号码登录失败、跳转至账号登录", new { Error = -1 });
}
var model = accountService.GetAccountList(new RB_Account_Extend()
var model = AccountService.GetAccountList(new RB_Account_Extend()
{
Account = account.Trim()
})?.FirstOrDefault();
......@@ -138,7 +138,7 @@ namespace EduSpider.WebApi.Controllers
{
model.UnionId = UnionId;
model.OpenId = OpenId;
accountService.UpdateAccountUnionId(model);
AccountService.UpdateAccountUnionId(model);
}
if (model.Status == Utility.Enum.DateStateEnum.Delete)
{
......@@ -181,7 +181,7 @@ namespace EduSpider.WebApi.Controllers
string code = parms.GetString("code");
string encryptedData = parms.GetString("encryptedData");
string iv = parms.GetString("iv");
result res = new result()
result res = new()
{
phoneNumber = "",
openid = ""
......@@ -293,7 +293,7 @@ namespace EduSpider.WebApi.Controllers
{
return ApiResult.Failed(message: "手机号码登录失败、跳转至账号登录", new { Error = -1 });
}
var model = accountService.GetAccountList(new RB_Account_Extend()
var model = AccountService.GetAccountList(new RB_Account_Extend()
{
Account = account.Trim()
})?.FirstOrDefault();
......@@ -314,7 +314,7 @@ namespace EduSpider.WebApi.Controllers
{
model.UnionId = UnionId;
model.OpenId = OpenId;
accountService.UpdateAccountUnionId(model);
AccountService.UpdateAccountUnionId(model);
}
if (model.Status == Utility.Enum.DateStateEnum.Delete)
{
......
EduSpider.WebApi/Startup.cs
View file @ 64d3d841
......@@ -34,7 +34,7 @@ namespace EduSpider.WebApi
//ActoFac注入
services.Replace(ServiceDescriptor.Transient<IControllerActivator, ServiceBasedControllerActivator>());
List<string> corsArray = new List<string>()
List<string> corsArray = new()
{
"http://localhost:7100",
"http://localhost:7200",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment