From 738f6c1aa8ba59fb666d347e02b5fb7f70491cf2 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期一, 01 七月 2024 09:37:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian
---
controllers/report_forms_controller.go | 2 +-
task/tasklist.go | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index e3346ae..660ebee 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -349,7 +349,7 @@
today := now.Day()
nowMonth := now.Format("2006-01")
- day, dateStr, err := service.NewSystemConfigService().GetInventoryCutOffPoint()
+ day, dateStr, _ := service.NewSystemConfigService().GetInventoryCutOffPoint()
if nowMonth == params.Date && today < day || today == day && now.Format("15:04") < dateStr { //鏈湀鏈嚦缁撶畻鏃堕棿鐐�
productIds := make([]string, 0, len(result))
for _, item := range result {
diff --git a/task/tasklist.go b/task/tasklist.go
index ec6298b..cdd479a 100644
--- a/task/tasklist.go
+++ b/task/tasklist.go
@@ -18,10 +18,7 @@
func StartDynamicTask() (err error) {
sysCfgService := service.NewSystemConfigService()
- day, timeStr, err := sysCfgService.GetInventoryCutOffPoint()
- if err != nil {
- return
- }
+ day, timeStr, _ := sysCfgService.GetInventoryCutOffPoint()
if day != 0 && timeStr != "" {
_, err = dynamicScheduler.Every(1).Month(day).At(timeStr).Do(MonthStats) //姣忔湀鍒濇墽琛屼竴娆�
if err != nil {
--
Gitblit v1.8.0