Merge branch 'cygx_need_05-30' of http://8.136.199.33:3000/hongze/hongze_mobile_admin into debug

services/company_approval/company_approval.go

@@ -689,8 +689,8 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 		//}
 		//如果是权益的用户客户转正审批单独走
 		if companyProduct.Status == utils.COMPANY_STATUS_FOREVER && companyProduct.ProductId == 2 {
-			contractInfo.StartDate = contractStartDate.AddDate(0, 4, 0).Format(utils.FormatDate) // 开始时间与结束时间都加四个月
-			contractInfo.EndDate = contractEndDate.AddDate(0, 4, 0).Format(utils.FormatDate)
+			//contractInfo.StartDate = contractStartDate.AddDate(0, 4, 0).Format(utils.FormatDate) // 开始时间与结束时间都加四个月
+			//contractInfo.EndDate = contractEndDate.AddDate(0, 4, 0).Format(utils.FormatDate)
 			startDate = contractInfo.StartDate
 			endDate = contractInfo.EndDate
 			companyReportPermissionList, tmpErr = company_approval.TryOutToFormalXClassRai(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, contractInfo.CompanyContractId, contractInfo.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.RaiPackageType)

utils/common.go

@@ -998,9 +998,9 @@ func GetQuarterStrStartDatesInRange(startTimeStr, endTimeStr string) (quartersSt
 	return quartersStar, nil
 }
 
-// 获取当前时间所属季度的最后一天，并往后推一个月
+// 获取当前时间所属季度的最后一天，并往后推两个月
 func GetLastDayOfQuarter(t time.Time) time.Time {
-	month := (t.Month()-1)/3*3 + 1 // 计算当前季度的第一个月份
+	month := (t.Month()-1)/3*3 + 2 // 计算当前季度的第一个月份
 	nextQuarter := month + 3
 	year := t.Year()
 	if nextQuarter > 12 {