zhangchuanxing 2 هفته پیش
والد
کامیت
3f474ba1cf
2فایلهای تغییر یافته به همراه3 افزوده شده و 2 حذف شده
  1. 1 1
      controllers/cygx/report_article.go
  2. 2 1
      models/company/company_contract.go

+ 1 - 1
controllers/cygx/report_article.go

@@ -5626,7 +5626,7 @@ func initContract() {
 	style.ApplyAlignment = true
 
 	var sheetName string
-	sheetName = "35W公司统计"
+	sheetName = "智造升级公司统计"
 	sheet, err := xlsxFile.AddSheet(sheetName)
 	if err != nil {
 		fmt.Println(err)

+ 2 - 1
models/company/company_contract.go

@@ -51,10 +51,11 @@ FROM
 WHERE
 	1 = 1 
 	AND c.company_id IN ( SELECT company_id FROM company_product WHERE 1 = 1 AND status = '正式' AND product_id = 2 ) 
+  	AND c.company_contract_id IN ( SELECT company_contract_id FROM company_contract_permission WHERE is_upgrade = 1 AND end_date > '2025-02-23' AND chart_permission_id = 19 ) 
 	AND c.status = 1
 	AND c.product_id = 2 
 	AND c.end_date > '2025-02-24' 
-	AND c.money >= '350000' `
+`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }