Merge remote-tracking branch 'origin/dev' into dev

server/api/v1/crm/demand.go

@@ -0,0 +1,69 @@
+package crm
+
+import (
+	"github.com/gin-gonic/gin"
+	"server/dao/crm"
+	"server/global"
+	"server/model/common/response"
+	"strconv"
+)
+
+type DemandApi struct{}
+
+func (da *DemandApi) QueryDemandsByCustomerId(c *gin.Context) {
+	id := c.Query("id")
+	customerId, err := strconv.Atoi(id)
+	demands, err := demandService.QueryDemandsByCustomerId(customerId)
+	if err != nil {
+		response.FailWithMessage("查询失败", c)
+		global.GVA_LOG.Error("QueryDemandsByCustomerId ====== " + err.Error())
+		return
+	}
+	response.OkWithData(demands, c)
+}
+
+func (da *DemandApi) CreateDemand(c *gin.Context) {
+	var demand crm.Demand
+	err := c.ShouldBindJSON(&demand)
+	if err != nil {
+		response.FailWithMessage("参数错误", c)
+		global.GVA_LOG.Error("CreateDemand ====== " + err.Error())
+		return
+	}
+	err = demandService.CreateDemand(demand)
+	if err != nil {
+		response.FailWithMessage("创建失败", c)
+		global.GVA_LOG.Error("CreateDemand ====== " + err.Error())
+		return
+	}
+	response.OkWithMessage("创建成功", c)
+}
+
+func (da *DemandApi) UpdateDemand(c *gin.Context) {
+	var demand crm.Demand
+	err := c.ShouldBindJSON(&demand)
+	if err != nil {
+		response.FailWithMessage("参数错误", c)
+		global.GVA_LOG.Error("UpdateDemand ====== " + err.Error())
+		return
+	}
+	err = demandService.UpdateDemand(demand)
+	if err != nil {
+		response.FailWithMessage("更新失败", c)
+		global.GVA_LOG.Error("UpdateDemand ====== " + err.Error())
+		return
+	}
+	response.OkWithMessage("更新成功", c)
+}
+
+func (da *DemandApi) DeleteDemand(c *gin.Context) {
+	id := c.Query("id")
+	demandId, _ := strconv.Atoi(id)
+	err := demandService.DeleteDemand(demandId)
+	if err != nil {
+		response.FailWithMessage("删除失败", c)
+		global.GVA_LOG.Error("DeleteDemand ====== " + err.Error())
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}

server/api/v1/crm/enter.go

@@ -6,10 +6,12 @@ type ApiGroup struct {
 	CustomerApi
 	CustomerGenreApi
 	ProgressApi
+	DemandApi
 }
 
 var (
 	customerService      = service.ServiceGroupApp.CRMServiceGroup.CustomerService
 	customerGenreService = service.ServiceGroupApp.CRMServiceGroup.CustomerGenreService
 	progressService      = service.ServiceGroupApp.CRMServiceGroup.ProgressService
+	demandService        = service.ServiceGroupApp.CRMServiceGroup.DemandService
 )

server/dao/crm/demand.go

@@ -4,6 +4,29 @@ import "server/global"
 
 type Demand struct {
 	global.GVA_MODEL
-	Content    string `json:"content" form:"content" gorm:"comment:内容"`
-	CustomerId int    `json:"customerId" form:"customerId" gorm:"comment:所属客户id"`
+	Content     string `json:"content" form:"content" gorm:"comment:需求内容"`
+	CustomerId  int    `json:"customerId" form:"customerId" gorm:"comment:所属客户id"`
+	ProposeTime string `json:"proposeTime" form:"proposeTime" gorm:"comment:提出时间"`
+	IsFinish    bool   `json:"isFinish" form:"isFinish" gorm:"comment:是否完成"`
+}
+
+func (Demand) TableName() string {
+	return "demand"
+}
+
+func QueryDemandsByCustomerId(customerId int) (demands []Demand, err error) {
+	err = global.GVA_DB.Model(&Demand{}).Where("customer_id = ?", customerId).Find(&demands).Error
+	return demands, err
+}
+
+func (d Demand) CreateDemand() error {
+	return global.GVA_DB.Create(&d).Error
+}
+
+func (d Demand) UpdateDemand() error {
+	return global.GVA_DB.Model(&Demand{}).Where("id = ?", d.ID).Updates(&d).Error
+}
+
+func DeleteDemand(id int) error {
+	return global.GVA_DB.Unscoped().Delete(&Demand{}, id).Error
 }

server/initialize/router.go

@@ -115,6 +115,7 @@ func Routers() *gin.Engine {
 		crmRouter.InitCustomerRouter(PrivateGroup)
 		crmRouter.InitCustomerGenreRouter(PrivateGroup)
 		crmRouter.InitProgressRouter(PrivateGroup)
+		crmRouter.InitDemandRouter(PrivateGroup)
 	}
 
 	global.GVA_LOG.Info("router register success")

server/router/crm/demand.go

@@ -0,0 +1,23 @@
+package crm
+
+import (
+	"github.com/gin-gonic/gin"
+	v1 "server/api/v1"
+	"server/middleware"
+)
+
+type DemandRouter struct{}
+
+func (s *DemandRouter) InitDemandRouter(Router *gin.RouterGroup) {
+	demandRouter := Router.Group("demand").Use(middleware.OperationRecord())
+	demandRouterWithoutRecord := Router.Group("demand")
+	demandApi := v1.ApiGroupApp.CRMApiGroup.DemandApi
+	{
+		demandRouter.POST("createDemand", demandApi.CreateDemand)
+		demandRouter.PUT("updateDemand", demandApi.UpdateDemand)
+		demandRouter.DELETE("deleteDemand", demandApi.DeleteDemand)
+	}
+	{
+		demandRouterWithoutRecord.GET("queryDemandsByCustomerId", demandApi.QueryDemandsByCustomerId)
+	}
+}

server/router/crm/enter.go

@@ -4,4 +4,5 @@ type RouterGroup struct {
 	CustomerRouter
 	CustomerGenreRouter
 	ProgressRouter
+	DemandRouter
 }

server/service/crm/demand.go

@@ -0,0 +1,21 @@
+package crm
+
+import "server/dao/crm"
+
+type DemandService struct{}
+
+func (ds *DemandService) QueryDemandsByCustomerId(id int) ([]crm.Demand, error) {
+	return crm.QueryDemandsByCustomerId(id)
+}
+
+func (ds *DemandService) CreateDemand(demand crm.Demand) error {
+	return demand.CreateDemand()
+}
+
+func (ds *DemandService) UpdateDemand(demand crm.Demand) error {
+	return demand.UpdateDemand()
+}
+
+func (ds *DemandService) DeleteDemand(id int) error {
+	return crm.DeleteDemand(id)
+}

server/service/crm/enter.go

@@ -4,4 +4,5 @@ type ServiceGroup struct {
 	CustomerService
 	CustomerGenreService
 	ProgressService
+	DemandService
 }