浏览代码

权益客户当前合同的开始时间,距离上一份合同的结束时间,超过一年,就属于新签

zhangchuanxing 1 周之前
父节点
当前提交
56fb96e0b0
共有 2 个文件被更改,包括 19 次插入0 次删除
  1. 8 0
      models/company/company_contract.go
  2. 11 0
      services/contract/contract.go

+ 8 - 0
models/company/company_contract.go

@@ -370,6 +370,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()

+ 11 - 0
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
 }