Merge remote-tracking branch 'origin/mark' into su

2019-11-26 17:26:51 +08:00
parent edcd56eb45 498a28bfe9
commit 47d6b5d2f8
8 changed files with 312 additions and 33 deletions
--- a/business/jxutils/jxutils_cms.go
+++ b/business/jxutils/jxutils_cms.go
@@ -119,6 +119,10 @@ func JxOperationTime2StrTime(value int16) string {
 	return fmt.Sprintf("%02d:%02d", value/100, value%100)
 }

+func JxOperationTime2TimeByDate(value int16, tm time.Time) (outTm time.Time) {
+	return utils.Str2TimeWithDefault(fmt.Sprintf("%s %02d:%02d:00", utils.Time2DateStr(tm), value/100, value%100), utils.DefaultTimeValue)
+}
+
 func GetPolygonFromCircle(lng, lat, distance float64, pointCount int) (points [][2]float64) {
 	points = make([][2]float64, pointCount)
 	for k := range points {