no message

controllers/statistic_company_merge.go

@@ -292,27 +292,27 @@ 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)
-
-		condition1 += ` AND a.create_time >= ? AND a.create_time < ? `
-		pars1 = append(pars1, startDate, tryOutEndDate)
-		condition1 += ` AND a.operation = ? `
-		pars1 = append(pars1, "try_out")
-		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
+		//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.create_time >= ? AND a.create_time < ? `
+		//pars1 = append(pars1, startDate, tryOutEndDate)
+		//condition1 += ` AND a.operation = ? `
+		//pars1 = append(pars1, "try_out")
+		//condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
 		//未续约已确认数量
 		notRenewalCondition := condition1
 		notRenewalPars := pars1
 		notRenewalCondition += conditionAscribRaiTotal
 		notRenewalPars = append(notRenewalPars, parsAscribeRaiTotal)
-		total, err := models.GetIncrementalCompanyCountByOperationRecord(notRenewalCondition, notRenewalPars)
+		total, err := company.GetIncrementalRenewalCompanyProductMergeCount(notRenewalCondition, notRenewalPars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -325,7 +325,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		notRenewalToBePars := pars1
 		notRenewalToBeCondition += conditionAscribRaiToBeTotal
 		notRenewalToBePars = append(notRenewalToBePars, parsAscribeRaiTobeTotal)
-		notRenewalCompanyToBeConfirmTotal, err = models.GetIncrementalCompanyCountByOperationRecord(notRenewalToBeCondition, notRenewalToBePars)
+		notRenewalCompanyToBeConfirmTotal, err = company.GetIncrementalRenewalCompanyProductMergeCount(notRenewalToBeCondition, notRenewalToBePars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -342,7 +342,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 				var tmpTotal int
 				if v == "试用" {
 					totalCondition1 += ` AND c.status = "试用" `
-					tmpTotal, err = models.GetIncrementalCompanyProductCountByOperationRecord(totalCondition1, totalPars1)
+					tmpTotal, err = company.GetIncrementalRenewalCompanyProductMergeCount(totalCondition1, totalPars1)
 					if err != nil && err.Error() != utils.ErrNoRow() {
 						br.Msg = "获取失败"
 						br.ErrMsg = "获取失败，Err:" + err.Error()