Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic/rai_data_summary.go

@@ -1197,9 +1197,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 				item.CompanyId = v.CompanyId
 				item.CompanyName = v.CompanyName
 				if isServerSeller {
-					item.SellerName = v.ShareSellerLast
+					item.SellerName = v.ShareSellerInit
 				} else {
-					item.SellerName = v.SellerNameLast
+					item.SellerName = v.SellerNameInit
 				}
 				item.StartDate = v.StartDate
 				item.EndDate = v.EndDate

models/company/company_contract.go

@@ -372,6 +372,14 @@ func GetFirstContractRai(companyId int) (item *CompanyContract, err error) {
 	return
 }
 
+// GetLastContractRai 权益获取最后一份合同
+func GetLastContractRai(companyId int) (item *CompanyContract, err error) {
+	o := orm.NewOrm()
+	sql := " SELECT * FROM company_contract WHERE company_id = ?  AND product_id= 2  AND status = 1   ORDER BY   end_date  DESC  LIMIT  1  "
+	err = o.Raw(sql, companyId).QueryRow(&item)
+	return
+}
+
 // 更新合同类型
 func UpdateCompanyContractTypeinit16_1_01(share_seller_init string, share_seller_id_init, companyId int) (err error) {
 	o := orm.NewOrm()

services/contract/contract.go

@@ -1809,6 +1809,17 @@ func GetCompanyContractCountRaiByLastYear(companyId int, startDate string) (tota
 	startDateTimeFirst, _ := time.Parse(utils.FormatDate, firstContractRai.StartDate)
 	if startDateTime.Before(startDateTimeFirst) {
 		total = 1
+		return
+	}
+	//当前合同的开始时间，距离上一份合同的结束时间，超过一年，就属于新签
+	lastContractRai, err := company.GetLastContractRai(companyId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		return
+	}
+
+	startDateTimeLast, _ := time.Parse(utils.FormatDate, lastContractRai.EndDate)
+	if startDateTime.After(startDateTimeLast) {
+		total = 1
 	}
 	return
 }

services/roadshow/report.go

@@ -142,11 +142,11 @@ func GetQuarterData(adminType, dimensionType string) (adminDataMapList []AdminDa
 	nowQuarterFirstDay := utils.GetNowQuarterFirstDay()                            //本季度第一天
 	nowQuarterLastDay := nowQuarterFirstDay.AddDate(0, 3, 0).Add(-1 * time.Second) //本季度最后一天
 
-	lastQuarterFirstDay1 := nowQuarterFirstDay.AddDate(0, -3, 0)                       //上个季度第一天
-	lastQuarterLastDay1 := lastQuarterFirstDay1.AddDate(0, 1, 0).Add(-1 * time.Second) //上个季度最后一天
+	lastQuarterFirstDay1 := nowQuarterFirstDay.AddDate(0, -3, 0)                     //上个季度第一天
+	lastQuarterLastDay1 := nowQuarterFirstDay.AddDate(0, 0, 0).Add(-1 * time.Second) //上个季度最后一天
 
-	lastQuarterFirstDay2 := nowQuarterFirstDay.AddDate(0, -6, 0)                       //上上个季度第一天
-	lastQuarterLastDay2 := lastQuarterFirstDay2.AddDate(0, 1, 0).Add(-1 * time.Second) //上上个季度最后一天
+	lastQuarterFirstDay2 := nowQuarterFirstDay.AddDate(0, -6, 0)                      //上上个季度第一天
+	lastQuarterLastDay2 := nowQuarterFirstDay.AddDate(0, -3, 0).Add(-1 * time.Second) //上上个季度最后一天
 
 	ch1 := make(chan AdminDataMap, 0)
 	ch2 := make(chan AdminDataMap, 0)