no message

controllers/statistic_company_merge.go

@@ -154,17 +154,17 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		}
 	}
 	//是否确认续约 CRM 13.9
-	conditionAscribRaiTotal += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1  OR  a.create_time <  '2023-01-01'  )   ` // 已确认
+	conditionAscribRaiTotal += ` AND  c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  ` // 已确认
 	parsAscribeRaiTotal = append(parsAscribeRaiTotal, noRenewedcompanyIds)
 
-	conditionAscribRaiToBeTotal += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2  AND  a.create_time >=  '2023-01-01' )  ` // 待确认
+	conditionAscribRaiToBeTotal += ` AND c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   ` // 待确认
 	parsAscribeRaiTobeTotal = append(parsAscribeRaiTobeTotal, noRenewedcompanyIds)
 
 	if isConfirm != -1 {
 		if isConfirm == 0 {
-			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2  AND  a.create_time >=  '2023-01-01' )  ` // 待确认
+			conditionAscribRai += ` AND  c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  ` // 待确认
 		} else {
-			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1  OR   a.create_time <  '2023-01-01' )    ` // 已确认
+			conditionAscribRai += ` AND  c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)    ` // 已确认
 		}
 		parsAscribeRai = append(parsAscribeRai, noRenewedcompanyIds)
 	}
@@ -292,17 +292,17 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		condition1 := condition
 		pars1 := pars
 
-		endDateTime, err := time.Parse(utils.FormatDate, endDate)
-		if err != nil {
-			br.Msg = "结束时间异常"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		//选择的日期加一天的原因是因为：筛选条件是截止到时分秒的，如果要把选择的这一天也统计进去，那么需要在选择的结束日期基础上加上一天
-		tryOutEndDate := endDateTime.AddDate(0, 0, 1).Format(utils.FormatDate)
+		//endDateTime, err := time.Parse(utils.FormatDate, endDate)
+		//if err != nil {
+		//	br.Msg = "结束时间异常"
+		//	br.ErrMsg = "获取失败，Err:" + err.Error()
+		//	return
+		//}
+		////选择的日期加一天的原因是因为：筛选条件是截止到时分秒的，如果要把选择的这一天也统计进去，那么需要在选择的结束日期基础上加上一天
+		//tryOutEndDate := endDateTime.AddDate(0, 0, 1).Format(utils.FormatDate)
 
-		condition1 += ` AND a.start_date >= ? AND a.start_date < ? `
-		pars1 = append(pars1, startDate, tryOutEndDate)
+		condition1 += ` AND a.end_date >= ? AND a.end_date  <= ? `
+		pars1 = append(pars1, startDate, endDate)
 		//condition1 += ` AND a.operation = ? `
 		//pars1 = append(pars1, "try_out")
 		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
@@ -384,7 +384,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 				br.ErrMsg = "获取失败，Err:" + err.Error()
 				return
 			}
-
+			//return
 			//列表页数据
 			tmpList, err := models.GetIncrementalCompanyListByOperationRecordMerge(condition1, pars1, startSize, pageSize)
 			if err != nil {