111

controllers/admin_api_controllers/analysis_api_controller.go

 package admin_api_controllers
 
 import (
-	"XT_Admin_Api/models/admin_models"
 	"XT_Admin_Api/service"
-	"XT_Admin_Api/utils"
-	"time"
 )
 
 type AnalysisAPIController struct {
 }
 
 func (this *AnalysisAPIController) HomeStatistics() {
-	range_data := this.GetString("range_data")
-	range_type, _ := this.GetInt64("range_type")
-	var rangeDate *time.Time
-	var parseDateErr error
-	var rangeTimeStamp int64
+	customCount, _ := service.GetCustomCount()
+	curYearCustomCount, _ := service.GetCurYearCustomCount()
+	curYearStandCustomCount, _ := service.GetCurYearStandCustomCount()
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
-		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
-			return
-		}
-		rangeTimeStamp = rangeDate.Unix()
-	} else {
-		rangeTimeStamp = 0
-	}
-	now := time.Now().Unix()
+	curYearDeluxeCustomCount, _ := service.GetCurYearDeluxeCustomCount()
+	curYearProfessionalCustomCount, _ := service.GetCurYearProfessionalCustomCount()
 
-	newOrgCount, _ := service.GetRegistedOrgCount(rangeTimeStamp, now)
-	totalOrg, _ := service.GetTotalOrgCount()
-	activeOrgCount, _ := service.GetActiveOrgCount(rangeTimeStamp, now)
-	totalActiveOrg, _ := service.GetActiveOrgTotalCount()
-	activeAdminCount, _ := service.GetActiveAdminUserCount(rangeTimeStamp, now)
-	adminTotalCount, _ := service.GetAdminUserTotalCount()
-	patientCount, _ := service.GetNewPatientCount(rangeTimeStamp, now)
-	patientTotalCount, _ := service.GetPatientTotalCount()
+	curYearOtherCustomCount, _ := service.GetCurYearOtherCustomCount()
+	curYearContractPriceCount, _ := service.GetCurYearContractPriceCount()
+	curYearSoftwarePriceCount, _ := service.GetCurYearSoftwarePriceCount()
 
-	var orgRegisterStatistics []*admin_models.Statistics
-	var newPatientStatistics []*admin_models.Statistics
-	var orgActiveAdminStatistics []*admin_models.Statistics
-	var orgActiveStatistics []*admin_models.Statistics
+	curYearHardwarePriceCount, _ := service.GetCurYearHardwarePriceCount()
 
-	switch range_type {
-	case 1:
+	curYearPaymentCollectionSumamtPriceCount, _ := service.GetCurYearPaymentCollectionSumamtPriceCount()
+	curYearPaymentCollectionSoftwarePriceCount, _ := service.GetCurYearPaymentCollectionSoftwarePriceCount()
 
-		break
+	curYearPaymentCollectionHardwarePriceCount, _ := service.GetCurYearPaymentCollectionHardwarePriceCount()
+	oneMonthCount := service.GetOneMonthEndDate()
+	threeMontheCount := service.GetThreeMonthEndDate()
 
-	case 2:
-		orgRegisterStatistics, _ = service.GetYesterDayRegistedOrgCount()
-		newPatientStatistics, _ = service.GetYesterDayNewPatientCount()
-		orgActiveAdminStatistics, _ = service.GetYesterDayActiveAdminUserCount()
-		orgActiveStatistics, _ = service.GetYesterDayActiveOrgCount()
+	_, curYearRenewalCount := service.GetCurYearRenewal()
+	_, curYearPaymentCollectionCount := service.GetCurYearPaymentCollection()
 
-		break
-	case 3:
-		orgRegisterStatistics, _ = service.GetWeekRegistedOrgCount()
-		newPatientStatistics, _ = service.GetWeekNewPatientCount()
-		orgActiveAdminStatistics, _ = service.GetWeekActiveAdminUserCount()
-		orgActiveStatistics, _ = service.GetWeekActiveOrgCount()
+	curYearWaitPutIntoEffectCount, _ := service.GetCurYearWaitPutIntoEffect()
+	curYearWaitAbutmentCount, _ := service.GetCurYearWaitAbutment()
 
-		break
-	case 4:
-		orgRegisterStatistics, _ = service.GetMonthRegistedOrgCount()
-		newPatientStatistics, _ = service.GetMonthNewPatientCount()
-		orgActiveAdminStatistics, _ = service.GetMonthActiveAdminUserCount()
-		orgActiveStatistics, _ = service.GetMonthActiveOrgCount()
-
-		break
-	case 5:
-		orgRegisterStatistics, _ = service.GetThreeMonthRegistedOrgCount()
-		newPatientStatistics, _ = service.GetThreeMonthNewPatientCount()
-		orgActiveAdminStatistics, _ = service.GetThreeMonthActiveAdminUserCount()
-		orgActiveStatistics, _ = service.GetThreeMonthActiveOrgCount()
-
-		break
-	case 6:
-		orgRegisterStatistics, _ = service.GetSixMonthRegistedOrgCount()
-		newPatientStatistics, _ = service.GetSixMonthNewPatientCount()
-		orgActiveAdminStatistics, _ = service.GetSixMonthActiveAdminUserCount()
-		orgActiveStatistics, _ = service.GetSixMonthActiveOrgCount()
-
-		break
-	case 7:
-		orgRegisterStatistics, _ = service.GetYearRegistedOrgCount()
-		newPatientStatistics, _ = service.GetYearNewPatientCount()
-		orgActiveAdminStatistics, _ = service.GetYearActiveAdminUserCount()
-		orgActiveStatistics, _ = service.GetYearActiveOrgCount()
-		break
-	}
+	cure := service.GetCurePrice()
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"org_count":                newOrgCount,
-		"org_total_count":          totalOrg,
-		"active_org_count":         activeOrgCount,
-		"active_org_total_count":   totalActiveOrg,
-		"active_admin_count":       activeAdminCount,
-		"active_admin_total_count": adminTotalCount,
-		"patient_count":            patientCount,
-		"patient_total_count":      patientTotalCount,
-		"org_count_list":           orgRegisterStatistics,
-		"patient_count_list":       newPatientStatistics,
-		"active_count_list":        orgActiveAdminStatistics,
-		"active_org_list":          orgActiveStatistics,
+		"customCount":                                customCount,
+		"curYearCustomCount":                         curYearCustomCount,
+		"curYearStandCustomCount":                    curYearStandCustomCount,
+		"curYearDeluxeCustomCount":                   curYearDeluxeCustomCount,
+		"curYearProfessionalCustomCount":             curYearProfessionalCustomCount,
+		"curYearOtherCustomCount":                    curYearOtherCustomCount,
+		"curYearContractPriceCount":                  curYearContractPriceCount,
+		"curYearSoftwarePriceCount":                  curYearSoftwarePriceCount,
+		"curYearHardwarePriceCount":                  curYearHardwarePriceCount,
+		"curYearPaymentCollectionSumamtPriceCount":   curYearPaymentCollectionSumamtPriceCount,
+		"curYearPaymentCollectionSoftwarePriceCount": curYearPaymentCollectionSoftwarePriceCount,
+		"curYearPaymentCollectionHardwarePriceCount": curYearPaymentCollectionHardwarePriceCount,
+		"oneMonthCount":                              oneMonthCount,
+		"threeMontheCount":                           threeMontheCount,
+		"curYearRenewalCount":                        curYearRenewalCount,
+		"curYearPaymentCollectionCount":              curYearPaymentCollectionCount,
+		"curYearWaitPutIntoEffectCount":              curYearWaitPutIntoEffectCount,
+		"curYearWaitAbutmentCount":                   curYearWaitAbutmentCount,
+		"cure":                                       cure,
 	})
 
 }

controllers/admin_api_controllers/custom_api_controller.go

 	defer redisClient.Close()
 
 	token, err := redisClient.Get("qn_token").Result()
-
+	fmt.Println(token)
 	if err != nil {
 		defer fmt.Println(err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGetQiniuUpToken)

models/custom.go

 	Remark          string `gorm:"column:remark" json:"remark" form:"remark"`
 	IsCheck         int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	CheckPerson     string `gorm:"column:check_person" json:"check_person" form:"check_person"`
+	RenewalPrice    string `gorm:"column:renewal_price" json:"renewal_price" form:"renewal_price"`
 }
 
 func (KyyChargeRenewal) TableName() string {

routers/router.go

 
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
-		// AllowAllOrigins:  true,
-		AllowOrigins:     []string{"http://api.szjkhd.com", "http://admin.xt.test.szjkhd.com", "http://admin.xt.szjkhd.com", "http://localhost:9527"},
+		AllowAllOrigins:  true,
+		AllowOrigins:     []string{"http://xtsf.sgjyun.com", "http://api.szjkhd.com", "http://sf.sgjyun.com", "http://admin.xt.test.szjkhd.com", "http://admin.xt.szjkhd.com", "http://localhost:9527"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},

service/admin_service.go

 	"database/sql"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"strconv"
 	"strings"
+	"time"
 )
 
 func GetAdminAccount(account string, password string) (*admin_models.AdminAccount, error) {
 // 获取累积客户数
 func GetCustomCount() (int64, error) {
 	var count int64
-	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1").Count(&count).Error
+	err := ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("status = 1").Count(&count).Error
 	if err != nil {
 		return 0, err
 	}
 // 本年新增收费客户
 func GetCurYearCustomCount() (int64, error) {
 	var count int64
-	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Count(&count).Error
+	err := ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(sign_time) = YEAR(CURDATE())").Count(&count).Error
 	if err != nil {
 		return 0, err
 	}
 // 统计本年新增标准版客户
 func GetCurYearStandCustomCount() (int64, error) {
 	var count int64
-	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 1").Count(&count).Error
+	err := ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(sign_time) = YEAR(CURDATE()) and custom_type = 1").Count(&count).Error
 	if err != nil {
 		return 0, err
 	}
 // 统计本年新增尊享版客户
 func GetCurYearDeluxeCustomCount() (int64, error) {
 	var count int64
-	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 2").Count(&count).Error
+	err := ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(sign_time) = YEAR(CURDATE()) and custom_type = 2").Count(&count).Error
 	if err != nil {
 		return 0, err
 	}
 // 统计本年新增专业版客户
 func GetCurYearProfessionalCustomCount() (int64, error) {
 	var count int64
-	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 3").Count(&count).Error
+	err := ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(sign_time) = YEAR(CURDATE()) and custom_type = 3").Count(&count).Error
 	if err != nil {
 		return 0, err
 	}
 // 统计本年新增其他版客户
 func GetCurYearOtherCustomCount() (int64, error) {
 	var count int64
-	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 4").Count(&count).Error
+	err := ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(sign_time) = YEAR(CURDATE()) and custom_type = 4").Count(&count).Error
 	if err != nil {
 		return 0, err
 	}
 }
 
 func GetCurYearContractPriceCount() (float64, error) {
-	var count float64
-	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	type Count struct {
+		Count float64
+	}
+	var count Count
+	err := ChargeReadDB().Model(&models.KyyChargeContract{}).Select("sum(sumamt) as count").Where("status = 1 and YEAR(start_time) = YEAR(CURDATE())").Scan(&count).Error
 	if err != nil {
 		return 0, err
 	}
-	return count, nil
+	return count.Count, nil
 }
 
 func GetCurYearSoftwarePriceCount() (float64, error) {
-	var count float64
-	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(software_price) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	type Count struct {
+		Count float64
+	}
+	var count Count
+	err := ChargeReadDB().Model(&models.KyyChargeContract{}).Select("sum(software_price) as count").Where("status = 1 and YEAR(start_time) = YEAR(CURDATE())").Scan(&count).Error
 	if err != nil {
 		return 0, err
 	}
-	return count, nil
+	return count.Count, nil
 }
 
 func GetCurYearHardwarePriceCount() (float64, error) {
-	var count float64
-	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(hardware_price) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	type Count struct {
+		Count float64
+	}
+	var count Count
+	err := ChargeReadDB().Model(&models.KyyChargeContract{}).Select("sum(hardware_price) as count").Where("status = 1 and YEAR(start_time) = YEAR(CURDATE())").Scan(&count).Error
 	if err != nil {
 		return 0, err
 	}
-	return count, nil
+	return count.Count, nil
 }
 
 func GetCurYearPaymentCollectionSumamtPriceCount() (float64, error) {
-	var count float64
-	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(payment_collection_sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	type Count struct {
+		Count float64
+	}
+	var count Count
+	err := ChargeReadDB().Model(&models.KyyChargePaymentCollection{}).Select("sum(payment_collection_sumamt) as count").Where("status = 1 and YEAR(payment_collection_date) = YEAR(CURDATE())").Scan(&count).Error
 	if err != nil {
 		return 0, err
 	}
-	return count, nil
+	return count.Count, nil
 }
 
 func GetCurYearPaymentCollectionSoftwarePriceCount() (float64, error) {
-	var count float64
-	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(software_sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	type Count struct {
+		Count float64
+	}
+	var count Count
+	err := ChargeReadDB().Model(&models.KyyChargePaymentCollection{}).Select("sum(software_sumamt) as count").Where("status = 1 and YEAR(payment_collection_date) = YEAR(CURDATE())").Scan(&count).Error
 	if err != nil {
 		return 0, err
 	}
-	return count, nil
+	return count.Count, nil
 }
 
 func GetCurYearPaymentCollectionHardwarePriceCount() (float64, error) {
-	var count float64
-	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(hardware_sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	type Count struct {
+		Count float64
+	}
+	var count Count
+	err := ChargeReadDB().Model(&models.KyyChargePaymentCollection{}).Select("sum(hardware_sumamt) as count").Where("status = 1 and YEAR(payment_collection_date) = YEAR(CURDATE())").Scan(&count).Error
 	if err != nil {
 		return 0, err
 	}
-	return count, nil
+	return count.Count, nil
+}
+
+type ChargeCustom struct {
+	ID            uint
+	Name          string
+	SignTime      string
+	SignEndTime   string
+	ContractPrice string
+	SoftwarePrice string
+	HardwarePrice string
+	Address       string
+	IsImplement   int
+	Remark        string
+}
+
+type ChargeRenewal struct {
+	ID          uint
+	CustomID    uint
+	SignEndTime string
+}
+
+type Results struct {
+	ChargeCustom
+	SignEndTime string
+}
+
+func GetOneMonthEndDate() (results []Results) {
+	currentDate := time.Now()
+	//threeMonthsLater := currentDate.AddDate(0, 3, 0)
+	oneMonthLater := currentDate.AddDate(0, 1, 0)
+	ChargeReadDB().Table("kyy_charge_custom as kc").
+		Select("kc.*, COALESCE(kr.end_time, kc.sign_end_time) as sign_end_time").
+		Joins("LEFT JOIN kyy_charge_renewal as kr ON kc.id = kr.custom_id").
+		Where("(kr.end_time BETWEEN ? AND ?) OR (kr.end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kc.sign_end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kc.sign_end_time BETWEEN ? AND ?)",
+			currentDate, oneMonthLater,
+			currentDate, oneMonthLater,
+			currentDate, oneMonthLater,
+
+			currentDate, oneMonthLater).
+		Scan(&results)
+	return
+}
+
+func GetThreeMonthEndDate() (results []Results) {
+	currentDate := time.Now()
+	threeMonthsLater := currentDate.AddDate(0, 3, 0)
+	ChargeReadDB().Table("kyy_charge_custom as kc").
+		Select("kc.*, COALESCE(kr.end_time, kc.sign_end_time) as sign_end_time").
+		Joins("LEFT JOIN kyy_charge_renewal as kr ON kc.id = kr.custom_id").
+		Where("(kr.end_time BETWEEN ? AND ?) OR (kr.end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kc.sign_end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kc.sign_end_time BETWEEN ? AND ?)",
+			currentDate, threeMonthsLater,
+			currentDate, threeMonthsLater,
+			currentDate, threeMonthsLater,
+
+			currentDate, threeMonthsLater).
+		Scan(&results)
+	return
+
+}
+
+func GetCurYearRenewal() (err error, count int64) {
+	currentYear := time.Now().Year()
+	err = ChargeReadDB().Model(&models.KyyChargeRenewal{}).Where("YEAR(start_time) = ?", currentYear).Count(&count).Error
+	if err != nil {
+		fmt.Println(err)
+	}
+	return
+}
+
+func GetCurYearPaymentCollection() (err error, count int64) {
+	currentYear := time.Now().Year()
+	var kpc []models.KyyChargePaymentCollection
+	err = ChargeReadDB().Model(&models.KyyChargePaymentCollection{}).Where("YEAR(payment_collection_date) = ? and payment_collection_type = 1", currentYear).Find(&kpc).Error
+	if err != nil {
+		fmt.Println(err)
+	}
+	count = 0
+	for _, item := range kpc {
+		pcs, _ := strconv.ParseInt(item.PaymentCollectionSumamt, 10, 64)
+		count = count + pcs
+	}
+	return
+}
+
+func GetCurYearWaitPutIntoEffect() (count int64, err error) {
+	currentYear := time.Now().Year()
+	err = ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("YEAR(sign_time) = ? and is_implement = 0", currentYear).Count(&count).Error
+	if err != nil {
+		fmt.Println(err)
+	}
+	return
+}
+
+func GetCurYearWaitAbutment() (count int64, err error) {
+	currentYear := time.Now().Year()
+	err = ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("(YEAR(sign_time) = ? and lis_status = 0) or (YEAR(sign_time) = ? and qc_status = 0) or (YEAR(sign_time) = ? and yb_status = 0)", currentYear, currentYear, currentYear).Count(&count).Error
+	if err != nil {
+		fmt.Println(err)
+	}
+	return
+}
+
+type ContractData struct {
+	Month                  int     `json:"month"`
+	TotalContractAmount    float64 `json:"total_contract_amount"`
+	SoftwareContractAmount float64 `json:"software_contract_amount"`
+	HardwareContractAmount float64 `json:"hardware_contract_amount"`
+}
+
+type PaymentData struct {
+	Month                 int     `json:"month"`
+	TotalPaymentAmount    float64 `json:"total_payment_amount"`
+	SoftwarePaymentAmount float64 `json:"software_payment_amount"`
+	HardwarePaymentAmount float64 `json:"hardware_payment_amount"`
+}
+
+type MonthlyData struct {
+	Month                  int     `json:"month"`
+	TotalContractAmount    float64 `json:"total_contract_amount"`
+	SoftwareContractAmount float64 `json:"software_contract_amount"`
+	HardwareContractAmount float64 `json:"hardware_contract_amount"`
+	TotalPaymentAmount     float64 `json:"total_payment_amount"`
+	SoftwarePaymentAmount  float64 `json:"software_payment_amount"`
+	HardwarePaymentAmount  float64 `json:"hardware_payment_amount"`
+
+	RenewalPrice float64 `json:"renewal_price"`
+}
+
+type MonthlyRenewalData struct {
+	Month        int     `json:"month"`
+	RenewalPrice float64 `json:"renewal_price"`
+}
+
+func GetCurePrice() (aa map[int]*MonthlyData) {
+	// 查询合同金额
+	var contractResults []ContractData
+	ChargeReadDB().Raw(`
+		SELECT
+			MONTH(sign_time) AS month,
+			SUM(CAST(contract_price AS DECIMAL(10, 2))) AS total_contract_amount,
+			SUM(CAST(software_price AS DECIMAL(10, 2))) AS software_contract_amount,
+			SUM(CAST(hardware_price AS DECIMAL(10, 2))) AS hardware_contract_amount
+		FROM kyy_charge_custom
+		GROUP BY MONTH((sign_time))
+		ORDER BY MONTH((sign_time));
+	`).Scan(&contractResults)
+
+	// 查询回款金额
+	var paymentResults []PaymentData
+	ChargeReadDB().Raw(`
+		SELECT
+			MONTH(payment_collection_date) AS month,
+			SUM(CAST(payment_collection_sumamt AS DECIMAL(10, 2))) AS total_payment_amount,
+			SUM(CAST(software_sumamt AS DECIMAL(10, 2))) AS software_payment_amount,
+			SUM(CAST(hardware_sumamt AS DECIMAL(10, 2))) AS hardware_payment_amount
+		FROM kyy_charge_payment_collection
+		GROUP BY MONTH(payment_collection_date)
+		ORDER BY MONTH(payment_collection_date);
+	`).Scan(&paymentResults)
+
+	// 查询续约总汇款金额
+	var paymentRenewalResults []MonthlyRenewalData
+	ChargeReadDB().Raw(`
+		SELECT
+			MONTH(sign_time) AS month,
+			SUM(CAST(renewal_price AS DECIMAL(10, 2))) AS renewal_price
+		FROM kyy_charge_renewal
+		GROUP BY MONTH(sign_time)
+		ORDER BY MONTH(sign_time)
+	`).Scan(&paymentRenewalResults)
+
+	// 合并结果
+	monthlyData := make(map[int]*MonthlyData)
+	for _, c := range contractResults {
+		monthlyData[c.Month] = &MonthlyData{
+			Month:                  c.Month,
+			TotalContractAmount:    c.TotalContractAmount,
+			SoftwareContractAmount: c.SoftwareContractAmount,
+			HardwareContractAmount: c.HardwareContractAmount,
+		}
+	}
+	for _, p := range paymentResults {
+		if md, ok := monthlyData[p.Month]; ok {
+			md.TotalPaymentAmount = p.TotalPaymentAmount
+			md.SoftwarePaymentAmount = p.SoftwarePaymentAmount
+			md.HardwarePaymentAmount = p.HardwarePaymentAmount
+		} else {
+			monthlyData[p.Month] = &MonthlyData{
+				Month:                 p.Month,
+				TotalPaymentAmount:    p.TotalPaymentAmount,
+				SoftwarePaymentAmount: p.SoftwarePaymentAmount,
+				HardwarePaymentAmount: p.HardwarePaymentAmount,
+			}
+		}
+	}
+
+	for _, c := range paymentRenewalResults {
+		monthlyData[c.Month] = &MonthlyData{
+			Month:        c.Month,
+			RenewalPrice: c.RenewalPrice,
+		}
+	}
+
+	return monthlyData
 }