no message

controllers/statistic_company_merge.go

@@ -351,7 +351,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 					notRenewalTryOut = tmpTotal
 				} else if v == "非试用" {
 					totalCondition1 += ` AND c.status IN ("冻结","流失") `
-					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()
@@ -378,12 +378,13 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			//}
 
 			//分页total单独计算
-			total, err = models.GetIncrementalCompanyProductCountByOperationRecord(condition1, pars1)
+			total, err = company.GetIncrementalRenewalCompanyProductMergeCount(condition1, pars1)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.Msg = "获取失败"
 				br.ErrMsg = "获取失败，Err:" + err.Error()
 				return
 			}
+
 			//列表页数据
 			tmpList, err := models.GetIncrementalCompanyMergeList(condition1, pars1, startSize, pageSize)
 			if err != nil {
@@ -434,18 +435,17 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		}
 	}
 
-	if dataType == "新签客户" || dataType == "续约客户" {
-		//合并合同所对应的权限
-		mappermissionName, err := cygxService.GetCompanyContractPermissionNameMapById(companyContractIds)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		for _, v := range list {
-			v.PermissionName = mappermissionName[v.CompanyContractId]
-		}
+	//合并合同所对应的权限
+	mappermissionName, err := cygxService.GetCompanyContractPermissionNameMapById(companyContractIds)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	for _, v := range list {
+		v.PermissionName = mappermissionName[v.CompanyContractId]
 	}
+
 	page := paging.GetPaging(currentIndex, pageSize, dataTotal)
 	resp := response.IncrementalCompanyListResp{
 		Paging:                            page,

models/response/statistic_report.go

@@ -98,15 +98,15 @@ type StackCompanyListResp struct {
 
 // 增量客户统计报表返回类
 type IncrementalCompanyListResp struct {
-	List                              []*models.IncrementalList
 	Paging                            *paging.PagingItem `description:"分页数据"`
-	TrialTotal                        int                `description:"新增试用客户数"`
-	NewCompanyTotal                   int                `description:"新签客户数"`
-	RenewalCompanyTotal               int                `description:"续约客户数"`
-	NotRenewalCompanyTotal            int                `description:"未续约客户数(已确认)"`
-	NotRenewalCompanyToBeConfirmTotal int                `description:"未续约客户数(待确认)"`
-	NotRenewalTryOut                  int                `description:"未续约客户（试用）数"`
-	NotRenewalNotTryOut               int                `description:"未续约客户（非试用）数"`
+	List                              []*models.IncrementalList
+	TrialTotal                        int `description:"新增试用客户数"`
+	NewCompanyTotal                   int `description:"新签客户数"`
+	RenewalCompanyTotal               int `description:"续约客户数"`
+	NotRenewalCompanyTotal            int `description:"未续约客户数(已确认)"`
+	NotRenewalCompanyToBeConfirmTotal int `description:"未续约客户数(待确认)"`
+	NotRenewalTryOut                  int `description:"未续约客户（试用）数"`
+	NotRenewalNotTryOut               int `description:"未续约客户（非试用）数"`
 }
 
 // MoreRenewReasonResp 未续约说明列表返回类

services/cygx/contract_allocation.go

@@ -309,7 +309,23 @@ func HandleAllocationCompanyContractByYanXuan(companyContractId int) (err error)
 }
 
 //func init() {
-//	HandleCompanyContractPackageDifference(1229)
+//	var condition string
+//	var pars []interface{}
+//
+//	condition = " AND status = 1  "
+//
+//	list, err := company.GetCompanyContractList(condition, pars)
+//	if err != nil {
+//		fmt.Println(err)
+//		return
+//	}
+//	fmt.Println(len(list))
+//	//return
+//	for _, v := range list {
+//		fmt.Println(v.CompanyContractId)
+//		HandleCompanyContractPackageDifference(v.CompanyContractId)
+//	}
+//
 //}
 
 // HandleCompanyContractPackageDifference 更新与上一份合同的金额的对比 '增加套餐','减少套餐','维持套餐'
@@ -327,7 +343,7 @@ func HandleCompanyContractPackageDifference(companyContractId int) (err error) {
 	pars = append(pars, companyContractId)
 	detail, e := company.GetCompanyContracDetail(condition, pars)
 	if e != nil {
-		err = errors.New("GetCompanyContracDetail, Err: " + e.Error())
+		err = errors.New("GetCompanyContracDetail,detail Err: " + e.Error())
 		return
 	}
 
@@ -341,7 +357,7 @@ func HandleCompanyContractPackageDifference(companyContractId int) (err error) {
 	pars = append(pars, detail.CompanyId, companyContractId, detail.ProductId)
 	detailPrevious, e := company.GetCompanyContracDetail(condition, pars)
 	if e != nil {
-		err = errors.New("GetCompanyContracDetail, Err: " + e.Error())
+		err = errors.New("GetCompanyContracDetail,detailPrevious Err: " + e.Error())
 		return
 	}
 	var packageDifference string