Quellcode durchsuchen

Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

黑艺新账号
hwh2023 vor 1 Jahr
Ursprung
Commit
7cb0abfef4
3 geänderte Dateien mit 35 neuen und 57 gelöschten Zeilen
  1. +33
    -41
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs
  2. +0
    -14
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs

+ 33
- 41
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesApiWx.cs Datei anzeigen

@@ -74,51 +74,43 @@ namespace Learun.Application.WebApi.Modules
/// <returns></returns>
public Response WxUpload(dynamic _)
{
try
{
var files = (List<HttpFile>)this.Context.Request.Files;
string folderId = Request.Form["folderId"];
string filePath = Config.GetValue("AnnexesFile");
string uploadDate = DateTime.Now.ToString("yyyyMMdd");
string fileEextension = Path.GetExtension(files[0].Name);
string fileType = fileEextension.Replace(".", "");
string fileGuid = Guid.NewGuid().ToString();

string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, fileEextension);

//创建文件夹
string path = Path.GetDirectoryName(virtualPath);
Directory.CreateDirectory(path);
AnnexesFileEntity fileAnnexesEntity = new AnnexesFileEntity();
if (!System.IO.File.Exists(virtualPath))
{
byte[] bytes = new byte[files[0].Value.Length];
files[0].Value.Read(bytes, 0, bytes.Length);
FileInfo file = new FileInfo(virtualPath);
FileStream fs = file.Create();
fs.Write(bytes, 0, bytes.Length);
fs.Close();

//文件信息写入数据库
fileAnnexesEntity.F_Id = fileGuid;
fileAnnexesEntity.F_FileName = files[0].Name;
fileAnnexesEntity.F_FilePath = virtualPath;
fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString();
fileAnnexesEntity.F_FileExtensions = fileEextension;
fileAnnexesEntity.F_FileType = fileType;
fileAnnexesEntity.F_CreateUserId = userInfo.userId;
fileAnnexesEntity.F_CreateUserName = userInfo.realName;

annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity);
}
var files = (List<HttpFile>)this.Context.Request.Files;
string folderId = Request.Form["folderId"];
string filePath = Config.GetValue("AnnexesFile");
string uploadDate = DateTime.Now.ToString("yyyyMMdd");
string fileEextension = Path.GetExtension(files[0].Name);
string fileType = fileEextension.Replace(".", "");
string fileGuid = Guid.NewGuid().ToString();

return SuccessString(folderId);
}
catch (Exception e)
string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, fileEextension);

//创建文件夹
string path = Path.GetDirectoryName(virtualPath);
Directory.CreateDirectory(path);
AnnexesFileEntity fileAnnexesEntity = new AnnexesFileEntity();
if (!System.IO.File.Exists(virtualPath))
{
byte[] bytes = new byte[files[0].Value.Length];
files[0].Value.Read(bytes, 0, bytes.Length);
FileInfo file = new FileInfo(virtualPath);
FileStream fs = file.Create();
fs.Write(bytes, 0, bytes.Length);
fs.Close();

return Fail($"上传失败({e.Message})");
//文件信息写入数据库
fileAnnexesEntity.F_Id = fileGuid;
fileAnnexesEntity.F_FileName = files[0].Name;
fileAnnexesEntity.F_FilePath = virtualPath;
fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString();
fileAnnexesEntity.F_FileExtensions = fileEextension;
fileAnnexesEntity.F_FileType = fileType;
fileAnnexesEntity.F_CreateUserId = userInfo.userId;
fileAnnexesEntity.F_CreateUserName = userInfo.realName;

annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity);
}

return SuccessString(folderId);
}

/// <summary>


+ 0
- 14
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs Datei anzeigen

@@ -2507,20 +2507,6 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
});
foreach (var teachClassEntity in teachclasslist)
{
//var classitemEntity = this.BaseRepository("CollegeMIS").FindEntity<ClassInfoEntity>(x => x.ClassNo == teachClassEntity.TeachClassNo);
//var insertTeachClassData = new TeachClassEntity()
//{
// AcademicYearNo = teachClassEntity.AcademicYearNo,
// Semester = teachClassEntity.Semester,
// DeptNo = classitemEntity?.DeptNo,
// MajorNo = classitemEntity?.MajorNo,
// LessonNo = teachClassEntity.LessonNo,
// Grade = classitemEntity?.Grade,
// LessonSortNo = teachClassEntity.LessonSortNo,
// TeachClassNo = teachClassEntity.TeachClassNo,
// EmpNo = teachClassEntity.EmpNo,
// F_SchoolId = teachClassEntity.F_SchoolId
//};
var insertTeachClassData = teachClassEntity;
//非空判断
if (TeachClassData.Count(m => m.AcademicYearNo == insertTeachClassData.AcademicYearNo &&


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs Datei anzeigen

@@ -2121,8 +2121,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
teach_AttendanceEntity.ALTId = item.ALTId;
teach_AttendanceEntity.LessonSortNo = item.LessonSortNo;
teach_AttendanceEntity.ADType = "1";
teach_AttendanceEntity.ADTime = entity.ADTime;
teach_AttendanceEntity.ClockTime = entity.ADTime;
teach_AttendanceEntity.ADTime = adtype1.ADTime;
teach_AttendanceEntity.ClockTime = adtype1.ADTime;
teach_AttendanceEntity.ClockStatus = "1";
teach_AttendanceEntity.ClockPlace = entity.ClockPlace;
teach_AttendanceEntity.ADPhoto = entity.ADPhoto;


Laden…
Abbrechen
Speichern