|
@@ -19,6 +19,7 @@ func AddCalculateQuarter(dataList []*edbDataModel.EdbDataList) (result *edbDataM
|
|
|
}()
|
|
|
|
|
|
endDate := dataList[len(dataList)-1].DataTime
|
|
|
+ endDate = endDate[:10]
|
|
|
endDateForm, err := time.Parse(utils.FormatDate, endDate)
|
|
|
if err != nil {
|
|
|
return result, err
|
|
@@ -31,6 +32,7 @@ func AddCalculateQuarter(dataList []*edbDataModel.EdbDataList) (result *edbDataM
|
|
|
var cureentDate time.Time
|
|
|
if thisMonth < 11 {
|
|
|
for k, v := range dataList {
|
|
|
+ v.DataTime = v.DataTime[:10]
|
|
|
dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
|
|
|
if err != nil {
|
|
|
errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
|
|
@@ -47,6 +49,7 @@ func AddCalculateQuarter(dataList []*edbDataModel.EdbDataList) (result *edbDataM
|
|
|
}
|
|
|
} else {
|
|
|
for k, v := range dataList {
|
|
|
+ v.DataTime = v.DataTime[:10]
|
|
|
dateTime, err := time.Parse(utils.FormatDate, v.DataTime)
|
|
|
if err != nil {
|
|
|
errMsg = "time.Parse Err:" + err.Error() + ";DataTime:" + v.DataTime
|