|
|
@@ -1611,11 +1611,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 +1635,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)
|
|
|
@@ -1714,7 +1714,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() {
|
xingzai