Merge branch 'crm/crm_14.4.1_V2' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_company_merge.go

@@ -1563,6 +1563,24 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
 
+	var conditionConfirm string
+	var parsConfirm []interface{}
+	conditionConfirm = ` AND  company_ascribe_id  != 9  `
+	companyConfirmList, err := company.GetCompanyContractNoRenewedAscribeList(conditionConfirm, parsConfirm, 0, 0)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetCompanyNoRenewedAscribeList Err:" + err.Error()
+		return
+	}
+	var noRenewedcompanyContractIds []int //已经确定未续约的公司ID
+	if len(companyConfirmList) == 0 {
+		noRenewedcompanyContractIds = append(noRenewedcompanyContractIds, 0) // 给一个不存在的ID
+	} else {
+		for _, v := range companyConfirmList {
+			noRenewedcompanyContractIds = append(noRenewedcompanyContractIds, v.CompanyContractId)
+		}
+	}
+
 	var condition string
 	var pars []interface{}
 
@@ -1590,16 +1608,22 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 
 	conditionRenewal := condition // 续约合同查询条件查询条件
 	parsRenewal := pars
-	conditionRenewal += ` AND a.start_date >= ? AND a.start_date <= ? `
+	//conditionRenewal += ` AND a.start_date >= ? AND a.start_date <= ? `
+	conditionRenewal += ` AND a.end_date >= ? AND a.end_date <= ? `
 	parsRenewal = append(parsRenewal, startDate, endDate)
-	conditionRenewal += ` AND a.rai_contract_type = ? `
-	parsRenewal = append(parsRenewal, "续约合同")
+	//conditionRenewal += ` AND a.rai_contract_type = ? `
+	//parsRenewal = append(parsRenewal, "续约合同")
+
+	conditionRenewal += ` AND  a.company_contract_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyContractIds)) + `)  ` // 已确认未续约
+	parsRenewal = append(parsRenewal, noRenewedcompanyContractIds)
+
 	totalRenewal, err := company.GetIncrementalRenewalCompanyProductMergeCount(conditionRenewal, parsRenewal)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
 	totalMoneyRenewal, err := company.GetIncrementalRenewalCompanyProductMergeSumMoney(conditionRenewal, parsRenewal)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -1611,11 +1635,11 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 	conditionRenewalEnd := condition // 今年结束的续约合同查询条件
 	parsRenewalEnd := pars
 
-	startDateTime, _ := time.Parse(utils.FormatDate, startDate)
-	startDateTime = startDateTime.AddDate(-1, 0, 0) //合同开始时间，与查询的结束时间，之间相差的天数大于  365天。
-
+	startDateTime, _ := time.Parse(utils.FormatDate, endDate)
+	startDateTime = startDateTime.AddDate(-1, 0, 2) //合同开始时间，与查询的结束时间，之间相差的天数大于  365天。
+	//fmt.Println("startDateTime", startDateTime)
 	conditionRenewalEnd += ` AND a.end_date >= ? AND a.end_date <= ?   AND a.start_date  < ?   `
-	parsRenewalEnd = append(parsRenewalEnd, startDate, endDate, startDate)
+	parsRenewalEnd = append(parsRenewalEnd, startDate, endDate, startDateTime)
 	conditionRenewalEnd += ` AND a.rai_contract_type = ? `
 	parsRenewalEnd = append(parsRenewalEnd, "续约合同")
 	totalRenewalEnd, err := company.GetIncrementalRenewalCompanyProductMergeCount(conditionRenewalEnd, parsRenewalEnd)
@@ -1635,7 +1659,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 	conditionNew := condition // 新签合同查询条件
 	parsNew := pars
 	conditionNew += ` AND a.end_date >= ? AND a.end_date <= ?   AND a.start_date  < ?  `
-	parsNew = append(parsNew, startDate, endDate, startDate)
+	parsNew = append(parsNew, startDate, endDate, startDateTime)
 	conditionNew += ` AND a.rai_contract_type = ? `
 	parsNew = append(parsNew, "新签合同")
 	totalNew, err := company.GetIncrementalRenewalCompanyProductMergeCount(conditionNew, parsNew)
@@ -1665,10 +1689,14 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 	if contractDataType == "续约合同" {
 		condition1 := condition
 		pars1 := pars
-		condition1 += ` AND a.start_date >= ? AND a.start_date <= ? `
+		//condition1 += ` AND a.start_date >= ? AND a.start_date <= ? `
+		condition1 += ` AND a.end_date >= ? AND a.end_date <= ? `
 		pars1 = append(pars1, startDate, endDate)
-		condition1 += ` AND a.rai_contract_type = ? `
-		pars1 = append(pars1, "续约合同")
+		//condition1 += ` AND a.rai_contract_type = ? `
+		//pars1 = append(pars1, "续约合同")
+
+		condition1 += ` AND  a.company_contract_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyContractIds)) + `)  ` // 已确认未续约
+		pars1 = append(pars1, noRenewedcompanyContractIds)
 
 		total, err := company.GetIncrementalRenewalCompanyProductMergeCount(condition1, pars1)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1687,7 +1715,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 		renewalContractMoney = int(totalMoney)
 
 		//列表页数据
-		tmpList, err := models.GetIncrementalCompanyMergeList(condition1, pars1, startSize, pageSize)
+		tmpList, err := models.GetIncrementalCompanyMergeListEnd(condition1, pars1, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -1714,7 +1742,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 		pars1 = append(pars1, startDate, endDate)
 
 		condition1 += ` AND a.start_date  < ?   `
-		pars1 = append(pars1, startDate)
+		pars1 = append(pars1, startDateTime)
 
 		total, err := company.GetIncrementalRenewalCompanyProductMergeCount(condition1, pars1)
 		if err != nil && err.Error() != utils.ErrNoRow() {