marking
/
Learn.Archives
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: marking:7075ec039dceedbee2e39699359de5ee26076448
Branches Tags
marking:master
marking:dev
marking:staging
..
compare: marking:031272ed6b6035872abaf7aceeae57b1d1837530
Branches Tags
marking:master
marking:dev
marking:staging

No commits in common. "7075ec039dceedbee2e39699359de5ee26076448" and "031272ed6b6035872abaf7aceeae57b1d1837530" have entirely different histories.
7075ec039d ... 031272ed6b

13 changed files with 5 additions and 571 deletions
Show Stats Expand all files Collapse all files

6
Learn.Archives.Core/Common/AppCommon.cs
View File

@ -38,11 +38,9 @@ namespace Learn.Archives.Core.Common
{ {
try try
{ {
var projectName = Assembly.GetExecutingAssembly().GetName().Name;
Assemblies = ExpandFunction.GetAssemblies(); Assemblies = ExpandFunction.GetAssemblies();
var assembliesType = Assemblies var assembliesType = Assemblies.Where(s => s.FullName.Contains("Archives")).SelectMany(s => s.ExportedTypes
//.Where(s => s.FullName.Contains(projectName)) .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false)));
.SelectMany(s => s.ExportedTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false)));
DbMatserType = assembliesType DbMatserType = assembliesType
.Where(u => u.GetInterfaces().Contains(typeof(IDB))); .Where(u => u.GetInterfaces().Contains(typeof(IDB)));
UserCenterType = assembliesType UserCenterType = assembliesType

96
Learn.Archives.Core/Model/Dto/SchoolBusinessDto.cs
View File

@ -1,96 +0,0 @@
using Learn.Archives.Core.Model.Enum;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Learn.Archives.Core.Model.Dto
{
/// <summary>
/// 解决方案记录
/// </summary>
public class SolutionRecordDto
{
/// <summary>
/// 需求+解决方案
/// </summary>
public string? Solution { get; set; }
/// <summary>
/// 解决方案是否已经完结
/// </summary>
public bool? SolutionEnd => !string.IsNullOrEmpty(EndRecord);
/// <summary>
/// 完结记录
/// </summary>
public string? EndRecord { get; set; }
/// <summary>
/// 执行记录
/// </summary>
public List<RecordDto> Record { get; set; }=new List<RecordDto>();
}
/// <summary>
/// 执行记录
/// </summary>
public class RecordDto
{
/// <summary>
/// 执行记录
/// </summary>
public required string ExecutionRecords { get; set; }
/// <summary>
/// 执行时间
/// </summary>
public DateTime ExecutionTime { get; set; }
}
/// <summary>
/// 赴校信息-反馈问题
/// </summary>
public class FeedbackQuestionsDto
{
/// <summary>
/// 反馈问题的类型
/// </summary>
public FeedbackQuestionTypeEnum QuestionType { get; set; }
/// <summary>
/// 同类型下的序号 例如[问题1]
/// </summary>
public required string Sort { get; set; }
/// <summary>
/// 问题
/// </summary>
public required string Question { get; set; }
/// <summary>
/// 解决方案
/// </summary>
public string? Solution { get; set; }
/// <summary>
/// 解决时间
/// </summary>
public DateTime? EndTime { get; set; }
}
/// <summary>
/// 赴校问题
/// </summary>
public class BusinessQuestionDto
{
/// <summary>
/// 问题
/// </summary>
public required string Question { get; set; }
/// <summary>
/// 解决方案
/// </summary>
public string? Solution { get; set; }
/// <summary>
/// 解决时间
/// </summary>
public DateTime? EndTime { get; set; }
}
}

21
Learn.Archives.Core/Model/Enum/ExamTypeEnum.cs
View File

@ -1,21 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Learn.Archives.Core.Model.Enum
{
/// <summary>
/// 考试类型
/// </summary>
public enum ExamTypeEnum
{
周考 = 0,
月考 = 1,
期中考试 = 2,
期末考试 = 3,
会考 = 4,
限时作业 = 5,
}
}

17
Learn.Archives.Core/Model/Enum/FeedbackQuestionEnum.cs
View File

@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Learn.Archives.Core.Model.Enum
{
public enum FeedbackQuestionTypeEnum
{
学校领导班子=1,
双师课堂=10,
设备=15,
学生=20,
其他=999,
}
}

16
Learn.Archives.Core/Model/Enum/PositionTypeEnum.cs
View File

@ -1,16 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Learn.Archives.Core.Model.Enum
{
public enum PositionTypeEnum
{
年级主任=100,
年级学科组组长= 110,
教导主任 = 120,
校长 = 130,
}
}

17
Learn.Archives.Core/Model/Enum/TestPaperTypeEnum.cs
View File

@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Learn.Archives.Core.Model.Enum
{
/// <summary>
/// 试卷类型
/// </summary>
public enum TestPaperTypeEnum
{
统一考试=1,
本校考试 = 10,
}
}

68
Learn.Archives.Core/Model/Exam.cs
View File

@ -1,68 +0,0 @@
using Learn.Archives.Core.Model.Enum;
using Learn.Archives.Core.Model.Interface;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Net;
using System.Text.Json;
using UserCenter.Model;
using UserCenter.Model.Enum;
using UserCenter.Model.Interface;
namespace Learn.Archives.Core.Model
{
/// <summary>
/// 考试
/// </summary>
[SugarTable("exam")]
public class Exam : EntityBaseId, IDB
{
/// <summary>
/// 考试名称
/// </summary>
[SugarColumn(Length = 20)]
public required string Name { get; set; }
/// <summary>
/// 考试名称
/// </summary>
[SugarColumn(Length = 20)]
public required string AdminName { get; set; }
/// <summary>
/// 年级
/// </summary>
[SugarColumn(Length = 12)]
public GradeEnum Level { get; set; }
/// <summary>
/// 试卷类型
/// </summary>
public TestPaperTypeEnum TestPaperType { get; set; }
/// <summary>
/// 考试类型
/// </summary>
public ExamTypeEnum Type { get; set; }
/// <summary>
/// 划线分数
/// </summary>
public decimal ScoreLine { get; set; }
/// <summary>
/// 参与班级数量
/// </summary>
public int? ClassCount { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 考试开始时间
/// </summary>
public DateTime StartTime { get; set; }
/// <summary>
/// 考试结束时间
/// </summary>
public DateTime EndTime { get; set; }
}
}

82
Learn.Archives.Core/Model/ExamClassInfo.cs
View File

@ -1,82 +0,0 @@
using Learn.Archives.Core.Model.Enum;
using Learn.Archives.Core.Model.Interface;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Net;
using System.Text.Json;
using UserCenter.Model;
using UserCenter.Model.Enum;
using UserCenter.Model.Interface;
namespace Learn.Archives.Core.Model
{
/// <summary>
/// 班级考试详情
/// </summary>
[SugarTable("examclassinfo")]
public class ExamClassInfo : EntityBaseId, IDB
{
/// <summary>
/// 考试Id
/// </summary>
[SugarColumn(Length = 20)]
public required string ExamId { get; set; }
/// <summary>
/// 考试名称
/// </summary>
[SugarColumn(Length = 20)]
public required string ExamName { get; set; }
/// <summary>
/// 考试班级名称
/// </summary>
[SugarColumn(Length = 20)]
public required string ClassName { get; set; }
/// <summary>
/// 考试班级id
/// </summary>
public long ClassId { get; set; }
/// <summary>
/// 考试班级所属学校ID
/// </summary>
[SugarColumn(Length = 20)]
public required string SchoolName { get; set; }
/// <summary>
/// 考试班级所属学校名称
/// </summary>
public long SchoolId { get; set; }
/// <summary>
/// 年级
/// </summary>
public GradeLevelEnum GradeLevel { get; set; }
/// <summary>
/// 毕业年份 毕业届
/// </summary>
public int GradeYear { get; set; }
/// <summary>
/// 上线人数 考试排名
/// </summary>
public decimal OnLineRanking { get; set; }
/// <summary>
/// 上线率
/// </summary>
public decimal OnLineRate { get; set; }
/// <summary>
/// 上线人数
/// </summary>
public int OnLineCount { get; set; }
/// <summary>
/// 参加人数
/// </summary>
public int PeopleCount { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now;
}
}

79
Learn.Archives.Core/Model/ExamUserInfo.cs
View File

@ -1,79 +0,0 @@
using Learn.Archives.Core.Model.Enum;
using Learn.Archives.Core.Model.Interface;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Net;
using System.Text.Json;
using UserCenter.Model;
using UserCenter.Model.Enum;
using UserCenter.Model.Interface;
namespace Learn.Archives.Core.Model
{
/// <summary>
/// 班级考试详情
/// </summary>
[SugarTable("examuserinfo")]
public class ExamUserInfo : EntityBaseId, IDB
{
/// <summary>
/// 考试Id
/// </summary>
[SugarColumn(Length = 20)]
public required string ExamId { get; set; }
/// <summary>
/// 考试名称
/// </summary>
[SugarColumn(Length = 20)]
public required string ExamName { get; set; }
/// <summary>
/// 年级
/// </summary>
[SugarColumn(Length = 12)]
public GradeEnum Level { get; set; }
/// <summary>
/// 试卷类型
/// </summary>
public TestPaperTypeEnum TestPaperType { get; set; }
/// <summary>
/// 考试类型
/// </summary>
public ExamTypeEnum Type { get; set; }
/// <summary>
/// 学生id
/// 来自<see cref="User.Id"/>
/// </summary>
public long UserId { get; set; }
/// <summary>
/// 赋分后的总分
/// </summary>
public decimal AssignScore { get; set; }
/// <summary>
/// 学科成绩
/// <para>数据库JSON字段!!!</para>
/// </summary>
[SugarColumn(IsJson = true, ColumnDataType = "varchar(800)")]
public Dictionary<SubjectEnum, decimal>? SubjectDic { get; set; }
/// <summary>
/// 赋分后的总分排名
/// </summary>
public int AssignRanking { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now;
}
}

43
Learn.Archives.Core/Model/Grade.cs
View File

@ -1,43 +0,0 @@
using Learn.Archives.Core.Model.Interface;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Net;
using System.Text.Json;
using UserCenter.Model;
using UserCenter.Model.Enum;
using UserCenter.Model.Interface;
namespace Learn.Archives.Core.Model
{
/// <summary>
/// 年级
/// </summary>
[SugarTable("grade")]
public class Grade : EntityBaseId, IDB
{
/// <summary>
/// 年级
/// </summary>
[SugarColumn(Length = 12)]
public GradeLevelEnum Level { get; set; }
/// <summary>
/// 毕业界
/// </summary>
[SugarColumn(Length = 6)]
public int Year { get; set; }
/// <summary>
/// 学校名称
/// </summary>
[SugarColumn(Length = 12)]
public required string SchoolName { get; set; }
/// <summary>
/// 学校Id
/// </summary>
public long SchoolId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now;
}
}

89
Learn.Archives.Core/Model/SchoolBusiness.cs
View File

@ -1,89 +0,0 @@
using Learn.Archives.Core.Model.Dto;
using Learn.Archives.Core.Model.Interface;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Net;
using System.Text.Json;
using UserCenter.Model;
using UserCenter.Model.Enum;
namespace Learn.Archives.Core.Model
{
/// <summary>
/// 学校业务联系表
/// </summary>
[SugarTable("schoolbusiness")]
public class SchoolBusiness : EntityBaseId, IDB
{
/// <summary>
/// 学校ID
/// </summary>
public long SchoolId { get; set; }
/// <summary>
/// 学校名称
/// </summary>
public required string SchoolName { get; set; }
/// <summary>
/// 年级
/// </summary>
public required string Grade { get; set; }
/// <summary>
/// 赴校时间
/// </summary>
public DateTime StartTime { get; set; } = DateTime.Now;
/// <summary>
/// 赴校备注
/// </summary>
[SugarColumn(IsNullable = true)]
public string? Remark { get; set; }
/// <summary>
/// 赴校问题已解决
/// </summary>
public long SolutionEnd { get; set; }
/// <summary>
/// 反馈问题
/// <para>数据库JSON字段!!!</para>
/// </summary>
[SugarColumn(IsNullable = true, IsJson = true,ColumnDataType ="text")]
public FeedbackQuestionsDto[]? FeedbackQuestions { get; set; }
/// <summary>
/// 解决方案的记录
/// <para>数据库JSON字段!!!</para>
/// </summary>
[SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "text")]
public SolutionRecordDto? SolutionRecord { get; set; }
/// <summary>
/// 开展座谈
/// </summary>
[SugarColumn(IsNullable =true,Length = 1000)]
public string? Discussion { get; set; }
/// <summary>
/// 开展班会
/// </summary>
[SugarColumn(IsNullable = true, Length = 1000)]
public string? ClassMeeting { get; set; }
/// <summary>
/// 反馈问题数量
/// </summary>
public long FeedbackCount => FeedbackQuestions?.Count() ?? 0;
/// <summary>
/// 反馈问题已解决数量
/// </summary>
public long SolveFeedbackCount => FeedbackQuestions?
.Count(s => s.EndTime != null) ?? 0;
/// <summary>
/// 开展过座谈
/// </summary>
public bool IsDiscussion => !string.IsNullOrEmpty(Discussion);
/// <summary>
/// 开展过班会
/// </summary>
public bool IsClassMeeting => !string.IsNullOrEmpty(ClassMeeting);
}
}

36
Learn.Archives.Core/Model/SchoolBusinessUser.cs
View File

@ -1,36 +0,0 @@
using Learn.Archives.Core.Model.Interface;
using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.Net;
using System.Text.Json;
using UserCenter.Model;
using UserCenter.Model.Enum;
namespace Learn.Archives.Core.Model
{
/// <summary>
/// 学校业务赴校人员表
/// </summary>
[SugarTable("schoolbusinessuser")]
public class SchoolBusinessUser : EntityBaseId, IDB
{
/// <summary>
/// 学校业务ID
/// </summary>
public long SchoolBusinessId { get; set; }
/// <summary>
/// 人员Id
/// </summary>
public required long AdminId { get; set; }
/// <summary>
/// 人员名称
/// </summary>
public required string AdminName { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now;
}
}

6
Learn.Archives.Core/Model/Student.cs → Learn.Archives.Core/Model/User.cs
View File

@ -10,10 +10,10 @@ namespace Learn.Archives.Core.Model
{ {
/// <summary> /// <summary>
/// 用户 /// 用户
/// <para>数据中心拓展学生</para> /// <para>数据中心拓展用户</para>
/// </summary> /// </summary>
[SugarTable("student")] [SugarTable("userexpand")]
public class Student : EntityBaseId, IDB public class UserExpand : EntityBaseId, IDB
{ {
/// <summary> /// <summary>
/// 用户中心的id /// 用户中心的id