1111

controllers/admin_api_controllers/analysis_api_controller.go

@@ -50,13 +50,14 @@ func (this *AnalysisAPIController) HomeStatistics() {
 		"curYearPaymentCollectionSumamtPriceCount":   curYearPaymentCollectionSumamtPriceCount,
 		"curYearPaymentCollectionSoftwarePriceCount": curYearPaymentCollectionSoftwarePriceCount,
 		"curYearPaymentCollectionHardwarePriceCount": curYearPaymentCollectionHardwarePriceCount,
-		"oneMonthCount":                              oneMonthCount,
-		"threeMontheCount":                           threeMontheCount,
-		"curYearRenewalCount":                        curYearRenewalCount,
-		"curYearPaymentCollectionCount":              curYearPaymentCollectionCount,
-		"curYearWaitPutIntoEffectCount":              curYearWaitPutIntoEffectCount,
-		"curYearWaitAbutmentCount":                   curYearWaitAbutmentCount,
-		"cure":                                       cure,
+
+		"oneMonthCount":                 oneMonthCount,
+		"threeMontheCount":              threeMontheCount,
+		"curYearRenewalCount":           curYearRenewalCount,
+		"curYearPaymentCollectionCount": curYearPaymentCollectionCount,
+		"curYearWaitPutIntoEffectCount": curYearWaitPutIntoEffectCount,
+		"curYearWaitAbutmentCount":      curYearWaitAbutmentCount,
+		"cure":                          cure,
 	})
 
 }

controllers/admin_api_controllers/custom_api_controller.go

@@ -146,7 +146,8 @@ func (this *CustomAPIController) CreateCustom() {
 	}
 }
 func (this *CustomAPIController) GetCustomList() {
-	list, _ := service.GetAllCustoms()
+	types, _ := this.GetInt64("type")
+	list, _ := service.GetAllCustoms(types)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})

routers/router.go

@@ -9,7 +9,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		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"},
+		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", "'http://localhost:8080"},
 		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/custom_service.go

@@ -1,6 +1,9 @@
 package service
 
-import "XT_Admin_Api/models"
+import (
+	"XT_Admin_Api/models"
+	"time"
+)
 
 func FindCustomInfo(org_id int64) (admin models.KyyChargeCustom, err error) {
 	err = ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("xt_org_id = ? AND status = 1", org_id).First(&admin).Error
@@ -21,8 +24,44 @@ func SaveCustomTwo(admin models.KyyChargeCustomThree) (err error) {
 	err = ChargeWriteDB().Model(&models.KyyChargeCustomThree{}).Save(&admin).Error
 	return
 }
-func GetAllCustoms() (cus []*models.KyyChargeCustom, err error) {
-	err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).Where("status = 1").Find(&cus).Error
+func GetAllCustoms(types int64) (cus []*models.KyyChargeCustom, err error) {
+	switch types {
+	case 0:
+		err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).Where("status = 1").Find(&cus).Error
+		break
+	case 2:
+		currentDate := time.Now()
+		oneMonthLater := currentDate.AddDate(0, 1, 0)
+
+		err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).Joins("LEFT JOIN kyy_charge_renewal as kr ON kyy_charge_custom.id = kr.custom_id").Where("status = 1 and ((kr.end_time BETWEEN ? AND ?) OR (kr.end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kyy_charge_custom.sign_end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kyy_charge_custom.sign_end_time BETWEEN ? AND ?))", currentDate, oneMonthLater,
+			currentDate, oneMonthLater,
+			currentDate, oneMonthLater,
+			currentDate, oneMonthLater).Find(&cus).Error
+
+		break
+	case 1:
+		currentDate := time.Now()
+		threeMonthsLater := currentDate.AddDate(0, 3, 0)
+		err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).Joins("LEFT JOIN kyy_charge_renewal as kr ON kyy_charge_custom.id = kr.custom_id").Where("status = 1 and ((kr.end_time BETWEEN ? AND ?) OR (kr.end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kyy_charge_custom.sign_end_time BETWEEN ? AND ?) OR (kr.end_time IS NULL AND kyy_charge_custom.sign_end_time BETWEEN ? AND ?))", currentDate, threeMonthsLater,
+			currentDate, threeMonthsLater,
+			currentDate, threeMonthsLater,
+			currentDate, threeMonthsLater).Find(&cus).Error
+
+		break
+	case 3:
+		currentYear := time.Now().Year()
+		err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).Joins("JOIN kyy_charge_renewal kcr on kcr.custom_id = kyy_charge_custom.id and YEAR(kcr.start_time) = ?", currentYear).Where("status = 1").Find(&cus).Error
+		break
+	case 4:
+		currentYear := time.Now().Year()
+		err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).Where("YEAR(sign_time) = ? and is_implement = 0", currentYear).Find(&cus).Error
+		break
+	case 5:
+		currentYear := time.Now().Year()
+		err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).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).Find(&cus).Error
+		break
+	}
+
 	return
 }