This commit is contained in:
parent
a048ffd787
commit
e17ab68abd
|
|
@ -115,11 +115,11 @@
|
|||
"DockerConfig": {
|
||||
"Prot": "5192:5192",
|
||||
"AspNetCoreEnv": "",
|
||||
"LastEnvName": "29dev",
|
||||
"LastEnvName": "marking001",
|
||||
"RemoveDaysFromPublished": "10",
|
||||
"WorkDir": "",
|
||||
"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": [
|
||||
{
|
||||
"EnvName": "29dev",
|
||||
|
|
|
|||
|
|
@ -188,12 +188,14 @@ namespace WGShare.API.Controllers.Frontend
|
|||
|
||||
var groupByUser = recordList.GroupBy(x => x.uid).ToList();
|
||||
|
||||
var beginDatetime = DateTimeUtils.FromJavaScriptTimestampToLocal(beginTimestamp);
|
||||
var endDaetime = DateTimeUtils.FromJavaScriptTimestampToLocal(endTimestamp);
|
||||
var value = new RoomMettingRecordExportDTO
|
||||
{
|
||||
RoomName = room.RoomName,
|
||||
RoomNum = room.RoomNum,
|
||||
BeginTime = DateTimeUtils.FromJavaScriptTimestampToLocal(beginTimestamp).ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
EndTime = DateTimeUtils.FromJavaScriptTimestampToLocal(endTimestamp).ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
BeginTime = beginDatetime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
EndTime = endDaetime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
Users = new List<UserBehavior>()
|
||||
};
|
||||
|
||||
|
|
@ -239,7 +241,7 @@ namespace WGShare.API.Controllers.Frontend
|
|||
|
||||
await MiniExcel.SaveAsByTemplateAsync(stream, $@"{AppDomain.CurrentDomain.BaseDirectory}meetingRecordTemplate.xlsx", value);
|
||||
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);
|
||||
return _ossHelper.GetAccessFileUrl(fileName, 5);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue