Browse Source

fix:兼容之前逻辑,当适冷结束时间和归还日期为空时,设置位当前时间

zoie 2 months ago
parent
commit
2fa12bf712
1 changed files with 9 additions and 0 deletions
  1. 9 0
      app/admin/controller/ice_raft.go

+ 9 - 0
app/admin/controller/ice_raft.go

@@ -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)