no message

controllers/statistic_report.go

@@ -2969,9 +2969,9 @@ func getTodayStackCompanyListV2(sysUser *system.Admin, currentIndex, pageSize, i
 			}
 		}
 		if isConfirm == 0 {
-			conditionAscribRai += ` AND c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 待确认
+			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `) AND  c.product_id = 2 ) ` // 待确认
 		} else {
-			conditionAscribRai += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 已确认
+			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)  OR  c.product_id = 2 )` // 已确认
 		}
 		parsAscribeRai = append(parsAscribeRai, companyIds)
 	}
@@ -3432,9 +3432,9 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 			}
 		}
 		if isConfirm == 0 {
-			conditionAscribRai += ` AND c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 待确认
+			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)  AND  c.product_id = 2 ) ` // 待确认
 		} else {
-			conditionAscribRai += ` AND c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)` // 已确认
+			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)   OR c.product_id = 1 )` // 已确认
 		}
 		parsAscribeRai = append(parsAscribeRai, companyIds)
 	}
@@ -3708,7 +3708,7 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 		pars1 = append(pars1, startDate, tryOutEndDate)
 		condition1 += ` AND a.operation = ? `
 		pars1 = append(pars1, "try_out")
-		condition1 += ` AND c.status not in ("永续","正式")  `
+		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
 		total, err := models.GetIncrementalCompanyCountByOperationRecord(condition1, pars1)
 		if err != nil && err.Error() != utils.ErrNoRow() {