no message

models/company/company_approval.go

@@ -523,18 +523,21 @@ func FreezeToTryOutXClassRai(companyId, productId, sellerId, companyApprovalId,
 			err = to.Commit()
 		}
 	}()
+
+	//123月份申请转正通过时，将试用期限延长(更新)至4.30。456月份申请转正通过时，将试用期限延长至7.31。789月份申请转正通过时，将试用期限延长至10.31。101112月份申请转正通过时，将试用期限延长至次年1.31。
+	endDate = utils.GetLastDayOfQuarter(time.Now()).Format(utils.FormatDate)
 	startDate = time.Now().Format(utils.FormatDate)
-	endDate = time.Now().AddDate(0, 3, 0).Format(utils.FormatDate)
+	//endDate = time.Now().AddDate(0, 3, 0).Format(utils.FormatDate)
 
-	sellerItem, err := system.GetSysAdminById(applyUserId)
-	if err != nil {
-		return
-	}
+	//sellerItem, err := system.GetSysAdminById(applyUserId)
+	//if err != nil {
+	//	return
+	//}
 
 	//更新用户产品状态
 	sql := `UPDATE company_product SET status='永续',is_suspend=0,approve_status='已审批',freeze_start_date=null,freeze_end_date=null,
-            start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = to.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
+            start_date=?,end_date=?,modify_time=NOW(),try_stage=1 WHERE company_id=?  `
+	_, err = to.Raw(sql, startDate, endDate, companyId).Exec()
 	if err != nil {
 		return
 	}
@@ -570,14 +573,21 @@ func FreezeToTryOutXClassRai(companyId, productId, sellerId, companyApprovalId,
 	}
 
 	//查询原先是否已经存在权限，如果有权限了，那么需要先删除原有的权限
-	count, _ := GetCompanyReportPermissionCount(companyId, productId)
-	if count > 0 {
-		sql := ` DELETE FROM company_report_permission WHERE company_id=? AND product_id=? `
-		_, err = to.Raw(sql, companyId, productId).Exec()
-		if err != nil {
-			return
-		}
+	//count, _ := GetCompanyReportPermissionCount(companyId, productId)
+	//if count > 0 {
+	//	sql := ` DELETE FROM company_report_permission WHERE company_id=? AND product_id=? `
+	//	_, err = to.Raw(sql, companyId, productId).Exec()
+	//	if err != nil {
+	//		return
+	//	}
+	//}
+
+	sql = `UPDATE company_report_permission SET  status='永续',start_date=?,end_date=? WHERE  company_id=?  ` // 更改权限的开始时间结束时间
+	_, err = to.Raw(sql, startDate, endDate, companyId).Exec()
+	if err != nil {
+		return
 	}
+
 	//获取需要试用的权限
 	delayPermissionItems, tmpErr := GetDelayPermissionItems(companyId, companyApprovalId)
 	if tmpErr != nil {

services/company_apply/company_approval.go

@@ -855,10 +855,11 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 		remark := "审批"
 		operation := "approve"
 		approveContent := "审批通过"
-		if companyProduct.Status == utils.COMPANY_STATUS_FOREVER && companyProduct.ProductId == 2 { //权益永续客户申请内容做变更
+		if companyProduct.InitStatus == utils.COMPANY_STATUS_FOREVER && companyProduct.ProductId == 2 { //权益永续客户申请内容做变更
 			//123月份申请转正通过时，将试用期限延长(更新)至4.30。456月份申请转正通过时，将试用期限延长至7.31。789月份申请转正通过时，将试用期限延长至10.31。101112月份申请转正通过时，将试用期限延长至次年1.31。
 			endDateContent := utils.GetLastDayOfQuarter(time.Now()).Format(utils.FormatDate)
 			approveContent += ",试用延期至" + endDateContent
+
 		}
 		services.AddCompanyOperationRecord(recodeInfo.CompanyId, companyProduct.SellerId, opUserId, recodeInfo.ProductId, opUserId, companyProduct.CompanyName,
 			companyProduct.ProductName, opUserName, remark, operation, approveContent, opUserName, "", companyProduct.Status)