add completeTime support report fillter

boxcost/api/bill-produce.go

@@ -200,7 +200,10 @@ func UpdateProduceBill(c *gin.Context, apictx *ApiSession) (interface{}, error)
 		if err != nil {
 			return nil, err
 		}
+	}
 
+	if bill.Status == "complete" {
+		bill.CompleteTime = time.Now()
 	}
 
 	bill.UpdateTime = time.Now()

boxcost/api/bill.go

@@ -292,6 +292,9 @@ func UpdateBill(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		}
 
 	}
+	if bill.Status == "complete" {
+		bill.CompleteTime = time.Now()
+	}
 
 	bill.UpdateTime = time.Now()
 	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionBillPurchase, bill.Id.Hex(), &bill)

boxcost/api/report.go

@@ -43,7 +43,7 @@ func ReportProduceList(c *gin.Context, apictx *ApiSession) (interface{}, error)
 
 		if len(timeRange) == 2 {
 			start, end := getTimeRange(timeRange[0].(string), timeRange[1].(string))
-			query["updateTime"] = bson.M{"$gte": start, "$lte": end}
+			query["completeTime"] = bson.M{"$gte": start, "$lte": end}
 		}
 		delete(query, "timeRange")
 	}
@@ -92,7 +92,7 @@ func ReportPurchaseList(c *gin.Context, apictx *ApiSession) (interface{}, error)
 
 		if len(timeRange) == 2 {
 			start, end := getTimeRange(timeRange[0].(string), timeRange[1].(string))
-			query["updateTime"] = bson.M{"$gte": start, "$lte": end}
+			query["completeTime"] = bson.M{"$gte": start, "$lte": end}
 		}
 		delete(query, "timeRange")
 	}
@@ -137,7 +137,7 @@ func ReportProduceDownload(c *gin.Context, apictx *ApiSession) (interface{}, err
 
 		if len(timeRange) == 2 {
 			start, end := getTimeRange(timeRange[0].(string), timeRange[1].(string))
-			query["updateTime"] = bson.M{"$gte": start, "$lte": end}
+			query["completeTime"] = bson.M{"$gte": start, "$lte": end}
 		}
 		delete(query, "timeRange")
 	}
@@ -259,7 +259,7 @@ func ReportPurchaseDownload(c *gin.Context, apictx *ApiSession) (interface{}, er
 
 		if len(timeRange) == 2 {
 			start, end := getTimeRange(timeRange[0].(string), timeRange[1].(string))
-			query["updateTime"] = bson.M{"$gte": start, "$lte": end}
+			query["completeTime"] = bson.M{"$gte": start, "$lte": end}
 		}
 		delete(query, "timeRange")
 	}

boxcost/api/tmp.json

@@ -1 +0,0 @@
-{"planIds":["638ef3960027470dd3a42f55","63bfa7dbe3c018ab8c1c14f8"]}

boxcost/api/utils.go

@@ -76,8 +76,6 @@ func excelToPdf(formBody *bytes.Buffer, pdfHost string) (*http.Response, error)
 
 	req := gotenberg.NewOfficeRequest(doc)
 	req.Landscape(true)
-	req.AddWebhookURLHTTPHeader("scale", "0.7")
-
 	return client.Post(req)
 
 }
@@ -106,15 +104,15 @@ func getUserById(apictx *ApiSession, id primitive.ObjectID) (*model.UserSmaple,
 }
 
 // 获取一天的起始终止时间
-func getDayRange(t time.Time) (start, end time.Time) {
-	loc, _ := time.LoadLocation("Local")
-	date := t.Format("2006-01-02")
-	startDate := date + " 00:00:00"
-	startTime, _ := time.ParseInLocation("2006-01-02 15:04:05", startDate, loc)
-	endDate := date + " 23:59:59"
-	endTime, _ := time.ParseInLocation("2006-01-02 15:04:05", endDate, loc)
-	return startTime, endTime
-}
+// func getDayRange(t time.Time) (start, end time.Time) {
+// 	loc, _ := time.LoadLocation("Local")
+// 	date := t.Format("2006-01-02")
+// 	startDate := date + " 00:00:00"
+// 	startTime, _ := time.ParseInLocation("2006-01-02 15:04:05", startDate, loc)
+// 	endDate := date + " 23:59:59"
+// 	endTime, _ := time.ParseInLocation("2006-01-02 15:04:05", endDate, loc)
+// 	return startTime, endTime
+// }
 
 // 获取时间跨度的起始终止时间
 func getTimeRange(startDate, endDate string) (start, end time.Time) {

boxcost/db/model/bill.go

@@ -44,11 +44,12 @@ type PurchaseBill struct {
 	Type string `bson:"type,omitempty" json:"type"`
 
 	// 进行中 created  已完成 complete 已弃用 deprecated  已审核 reviewed
-	Status     string               `bson:"status,omitempty" json:"status"`
-	Reviewed   int                  `bson:"reviewed,omitempty" json:"reviewed"`   // -1 代表未审核 1已审核
-	SignUsers  []primitive.ObjectID `bson:"signUsers,omitempty" json:"signUsers"` // 多个签名人
-	CreateTime time.Time            `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time            `bson:"updateTime,omitempty" json:"updateTime"`
+	Status       string               `bson:"status,omitempty" json:"status"`
+	Reviewed     int                  `bson:"reviewed,omitempty" json:"reviewed"`   // -1 代表未审核 1已审核
+	SignUsers    []primitive.ObjectID `bson:"signUsers,omitempty" json:"signUsers"` // 多个签名人
+	CreateTime   time.Time            `bson:"createTime,omitempty" json:"createTime"`
+	UpdateTime   time.Time            `bson:"updateTime,omitempty" json:"updateTime"`
+	CompleteTime time.Time            `bson:"completeTime,omitempty" json:"completeTime"`
 
 	//供应商
 	Supplier string `bson:"supplier,omitempty" json:"supplier"`
@@ -111,11 +112,12 @@ type ProduceBill struct {
 	Type string `bson:"type,omitempty" json:"type"`
 
 	// 进行中 created  已完成 complete 已弃用 deprecated
-	Status     string               `bson:"status,omitempty" json:"status"`
-	Reviewed   int                  `bson:"reviewed,omitempty" json:"reviewed"`   // -1 代表未审核 1已审核
-	SignUsers  []primitive.ObjectID `bson:"signUsers,omitempty" json:"signUsers"` // 多个签名人
-	CreateTime time.Time            `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time            `bson:"updateTime,omitempty" json:"updateTime"`
+	Status       string               `bson:"status,omitempty" json:"status"`
+	Reviewed     int                  `bson:"reviewed,omitempty" json:"reviewed"`   // -1 代表未审核 1已审核
+	SignUsers    []primitive.ObjectID `bson:"signUsers,omitempty" json:"signUsers"` // 多个签名人
+	CreateTime   time.Time            `bson:"createTime,omitempty" json:"createTime"`
+	UpdateTime   time.Time            `bson:"updateTime,omitempty" json:"updateTime"`
+	CompleteTime time.Time            `bson:"completeTime,omitempty" json:"completeTime"`
 
 	//确认收货数量
 	ConfirmCount int `bson:"confirmCount,omitempty" json:"confirmCount"`

boxcost/db/model/tmp.json

@@ -1 +0,0 @@
-{"supplierId": "","timeRange": ["2022-12-07","2022-12-08"],"planIds": []}