marking
/
WGShare.API
19
0
Fork 0
Code Pull Requests Actions Releases 3 Activity

1

This commit is contained in:
youngq 2024-09-23 11:48:07 +08:00
parent a048ffd787
commit e17ab68abd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WGShare.API/AntDeploy.json
View File

@ -115,11 +115,11 @@
"DockerConfig": { "DockerConfig": {
"Prot": "5192:5192", "Prot": "5192:5192",
"AspNetCoreEnv": "", "AspNetCoreEnv": "",
"LastEnvName": "29dev", "LastEnvName": "marking001",
"RemoveDaysFromPublished": "10", "RemoveDaysFromPublished": "10",
"WorkDir": "", "WorkDir": "",
"Volume": "", "Volume": "",
"Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Development -e TZ=Asia/Shanghai", "Other": "--name wgshare-api -e ASPNETCORE_ENVIRONMENT=Production -e TZ=Asia/Shanghai",
"EnvPairList": [ "EnvPairList": [
{ {
"EnvName": "29dev", "EnvName": "29dev",

8
WGShare.API/Controllers/Frontend/HomeController.cs
View File

@ -188,12 +188,14 @@ namespace WGShare.API.Controllers.Frontend
var groupByUser = recordList.GroupBy(x => x.uid).ToList(); var groupByUser = recordList.GroupBy(x => x.uid).ToList();
var beginDatetime = DateTimeUtils.FromJavaScriptTimestampToLocal(beginTimestamp);
var endDaetime = DateTimeUtils.FromJavaScriptTimestampToLocal(endTimestamp);
var value = new RoomMettingRecordExportDTO var value = new RoomMettingRecordExportDTO
{ {
RoomName = room.RoomName, RoomName = room.RoomName,
RoomNum = room.RoomNum, RoomNum = room.RoomNum,
BeginTime = DateTimeUtils.FromJavaScriptTimestampToLocal(beginTimestamp).ToString("yyyy-MM-dd HH:mm:ss"), BeginTime = beginDatetime.ToString("yyyy-MM-dd HH:mm:ss"),
EndTime = DateTimeUtils.FromJavaScriptTimestampToLocal(endTimestamp).ToString("yyyy-MM-dd HH:mm:ss"), EndTime = endDaetime.ToString("yyyy-MM-dd HH:mm:ss"),
Users = new List<UserBehavior>() Users = new List<UserBehavior>()
}; };
@ -239,7 +241,7 @@ namespace WGShare.API.Controllers.Frontend
await MiniExcel.SaveAsByTemplateAsync(stream, $@"{AppDomain.CurrentDomain.BaseDirectory}meetingRecordTemplate.xlsx", value); await MiniExcel.SaveAsByTemplateAsync(stream, $@"{AppDomain.CurrentDomain.BaseDirectory}meetingRecordTemplate.xlsx", value);
stream.Seek(0, SeekOrigin.Begin); stream.Seek(0, SeekOrigin.Begin);
var fileName = $@"excel/{room.RoomName}-参会记录({value.BeginTime}至{value.EndTime}).xlsx"; var fileName = $@"excel/{room.RoomName}-参会记录-{beginDatetime.ToString("yyyyMMddHHmmss")}至{endDaetime.ToString("yyyyMMddHHmmss")}).xlsx";
_ossHelper.UploadWithExpireTime(fileName, stream, 10); _ossHelper.UploadWithExpireTime(fileName, stream, 10);
return _ossHelper.GetAccessFileUrl(fileName, 5); return _ossHelper.GetAccessFileUrl(fileName, 5);
} }