no message

controllers/cygx/enter_score.go

@@ -921,7 +921,7 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 			if item != nil {
 				ranking = item.Ranking
 				securitiesFirmsName = item.SecuritiesFirmsName
-				proportionTotal = fmt.Sprint(item.ProportionTotal)
+				proportionTotal = fmt.Sprint(item.MergeProportion)
 			}
 			if mapenterScoreTypeCompanyIds[vC.CompanyId] { //按照百分比展示的拼接 %
 				proportionTotal += "%"
@@ -1193,7 +1193,13 @@ func (this *EnterScoreController) EnterScoreRankingOverview() {
 		}
 		for _, v := range quarterDate {
 			itemQuarter := new(cygx.QuarterDateListResp)
-			itemQuarter.Quarter = v
+			quarter := v
+			//时间后面的月日替换成季度 Q几
+			quarter = strings.Replace(quarter, "-10-01", "Q4", -1)
+			quarter = strings.Replace(quarter, "-07-01", "Q3", -1)
+			quarter = strings.Replace(quarter, "-04-01", "Q2", -1)
+			quarter = strings.Replace(quarter, "-01-01", "Q1", -1)
+			itemQuarter.Quarter = quarter
 			itemQuarter.ProportionListText = mapRankingText[v]
 			itemsQuarter = append(itemsQuarter, itemQuarter)
 		}

services/company_apply/company_approval.go

@@ -855,7 +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 { //权益永续客户申请内容做变更
+			//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)
 	}