|
|
@@ -917,12 +917,18 @@ func (e IceRaftRecordController) ExportExecl(c *gin.Context) {
|
|
|
line++
|
|
|
start, _ := time.Parse("2006-01-02 15:04:05", v.StartIceColdTime.String())
|
|
|
end, _ := time.Parse("2006-01-02 15:04:05", v.EndForColdTime.String())
|
|
|
+ if v.EndForColdTime.String() == "" {
|
|
|
+ end = time.Now()
|
|
|
+ }
|
|
|
|
|
|
IceColdTime := end.Sub(start)
|
|
|
ColdTime := fmt.Sprintf("%vh%vm", math.Floor(IceColdTime.Hours()), int(IceColdTime.Minutes())%60)
|
|
|
|
|
|
Updstart, _ := time.Parse("2006-01-02 15:04:05", v.ReturnDate.String())
|
|
|
Useend, _ := time.Parse("2006-01-02 15:04:05", v.IceUseTime.String())
|
|
|
+ if v.ReturnDate.String() == "" {
|
|
|
+ Updstart = time.Now()
|
|
|
+ }
|
|
|
sub := Updstart.Sub(Useend)
|
|
|
subTime := fmt.Sprintf("%vh%vm", math.Floor(sub.Hours()), int(sub.Minutes())%60)
|
|
|
f.SetCellValue("Sheet1", fmt.Sprintf("A%d", line), i+1)
|
|
|
@@ -974,6 +980,9 @@ func (e IceRaftRecordController) ExportExecl(c *gin.Context) {
|
|
|
for i, v := range list {
|
|
|
line++
|
|
|
Update, _ := time.Parse("2006-01-02 15:04:05", v.ReturnDate.String())
|
|
|
+ if v.ReturnDate.String() == "" {
|
|
|
+ Update = time.Now()
|
|
|
+ }
|
|
|
UseTime, _ := time.Parse("2006-01-02 15:04:05", v.IceUseTime.String())
|
|
|
sub := Update.Sub(UseTime)
|
|
|
subTime := fmt.Sprintf("%vh%vm", math.Floor(sub.Hours()), int(sub.Minutes())%60)
|