专项工作台后端

db/workspace.go

@@ -3,11 +3,12 @@ package db
 import (
 	"context"
 	"fmt"
-	"github.com/issue9/conv"
-	"github.com/sirupsen/logrus"
 	"time"
 	"youngee_b_api/model/gorm_model"
 	"youngee_b_api/model/http_model"
+
+	"github.com/issue9/conv"
+	"github.com/sirupsen/logrus"
 )
 
 func GetWorkspaceNums(ctx context.Context, enterpriseID int64) (*http_model.WorkspaceNums, error) {
@@ -45,74 +46,29 @@ func GetWorkspaceNums(ctx context.Context, enterpriseID int64) (*http_model.Work
 	return &workspaceNums, nil
 }
 
-func GetWorkspacePieNums(ctx context.Context, enterpriseID int64) (*http_model.WorkspacePieNums, error) {
-	var workspaceNums http_model.WorkspacePieNums
-	var DataPendingNum, LinkPendingNum, ScriptPendingNum int64
-	db := GetReadDB(ctx)
-	var DataProjectIDs []int64
-	db = db.Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_status = 9", enterpriseID).Find(&DataProjectIDs)
-	db1 := GetReadDB(ctx)
-	db1.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 14", DataProjectIDs).Count(&DataPendingNum)
-
-	db2 := GetReadDB(ctx)
-	var scriptProjectIDs []int64
-	db2 = db2.Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_status = 9", enterpriseID).Find(&scriptProjectIDs)
-	db3 := GetReadDB(ctx)
-	db3.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 8", scriptProjectIDs).Count(&ScriptPendingNum)
-
-	db4 := GetReadDB(ctx)
-	var linkProjectIDs []int64
-	db4 = db4.Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_status = 9", enterpriseID).Find(&linkProjectIDs)
-	db5 := GetReadDB(ctx)
-	db5 = db5.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 12", linkProjectIDs).Count(&LinkPendingNum)
-
-	workspaceNums.DataPendingNum = DataPendingNum
-	workspaceNums.LinkPendingNum = LinkPendingNum
-	workspaceNums.ScriptPendingNum = ScriptPendingNum
-	return &workspaceNums, nil
-}
-
-func GetWorkspacePieNums2(ctx context.Context, enterpriseID int64) (*http_model.WorkspacePieNums2, error) {
-	var workspaceNums http_model.WorkspacePieNums2
-	var SketchPendingNum, AccSelecting, ShipmentPendingNum int64
-	db := GetReadDB(ctx)
-	var sketchProjectIDs []int64
-	db = db.Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_status = 9", enterpriseID).Find(&sketchProjectIDs)
-	db5 := GetReadDB(ctx)
-	db5.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 10", sketchProjectIDs).Count(&SketchPendingNum)
-	fmt.Println("SketchPendingNum:", SketchPendingNum)
-
-	var RecruitingProjectIDs []int64
-	db1 := GetReadDB(ctx)
-	db1 = db1.Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_status = 4", enterpriseID).Find(&RecruitingProjectIDs)
-	db4 := GetReadDB(ctx)
-	db4.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_status = 1", RecruitingProjectIDs).Count(&AccSelecting)
-
-	db2 := GetReadDB(ctx)
-	var LogisticProjectIDs []int64
-	db2 = db2.Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_status = 9", enterpriseID).Find(&LogisticProjectIDs)
-	db3 := GetReadDB(ctx)
-	db3.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 4", LogisticProjectIDs).Count(&ShipmentPendingNum)
-
-	workspaceNums.SketchPendingNum = SketchPendingNum
-	workspaceNums.AccSelecting = AccSelecting
-	workspaceNums.ShipmentPendingNum = ShipmentPendingNum
-	return &workspaceNums, nil
-}
-
-func GetWorkspaceDDLproject(ctx context.Context, enterpriseID int64) (*http_model.WorkspaceDDLprojectdata, error) {
+func GetWorkspaceDDLproject(ctx context.Context, enterpriseID, pageSize, pageNum int64) (*http_model.WorkspaceDDLprojectdata, error) {
 	var projectInfos []gorm_model.ProjectInfo
 	//DDLproject := http_model.WorkspaceDDLprojectdata{}
 	db := GetReadDB(ctx)
 	ddl := conv.MustString(time.Now())[0:10] + "%"
-	err := db.Model(gorm_model.ProjectInfo{}).Where("enterprise_id = ? AND project_status = 4 AND recruit_ddl like ?", enterpriseID, ddl).
-		Or("enterprise_id = ? AND project_status = 6 AND auto_fail_at like ?", enterpriseID, ddl).Find(&projectInfos).Error
-	if err != nil {
-		logrus.WithContext(ctx).Errorf("[Project db] Update ProjectInfo error,err:%+v", err)
+	db = db.Model(gorm_model.ProjectInfo{}).Where("enterprise_id = ?", enterpriseID)
+	db = db.Where("project_status = 4 AND recruit_ddl like ?", ddl).Or("project_status = 6 AND auto_fail_at like ?", ddl).Or("project_status = 3 AND pass_at like ?", ddl).Or("project_status = 10 AND finish_at like ?", ddl)
+	// 查询总数
+	var total int64
+	if err := db.Count(&total).Error; err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceDDLproject db] error query mysql total, err:%+v", err)
 		return nil, err
 	}
+	// 查询该页数据
+	limit := pageSize
+	offset := pageSize * pageNum // assert pageNum start with 0
 	wsDDLprojectData := http_model.WorkspaceDDLprojectdata{}
-	wsDDLprojectData.Total = conv.MustString(len(projectInfos))
+	err := db.Order("project_id").Limit(int(limit)).Offset(int(offset)).Find(&projectInfos).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceDDLproject db] Find Pagesize DDLProjectInfo error,err:%+v", err)
+		return nil, err
+	}
+	wsDDLprojectData.Total = conv.MustString(total)
 	for _, projectInfo := range projectInfos {
 		DDLProjectPreview := new(http_model.DDLProjectPreview)
 		DDLProjectPreview.ProjectId = conv.MustString(projectInfo.ProjectID)
@@ -125,9 +81,109 @@ func GetWorkspaceDDLproject(ctx context.Context, enterpriseID int64) (*http_mode
 		if projectInfo.AutoFailAt != nil {
 			DDLProjectPreview.AutoFailAt = conv.MustString(projectInfo.AutoFailAt)[0:19]
 		}
+		if projectInfo.PassAt != nil {
+			DDLProjectPreview.PassAt = conv.MustString(projectInfo.PassAt)[0:19]
+		}
+		if projectInfo.FinishAt != nil {
+			DDLProjectPreview.FinishAt = conv.MustString(projectInfo.FinishAt)[0:19]
+		}
 		DDLProjectPreview.RecruitNum = conv.MustString(projectInfo.RecruitNum)
 		wsDDLprojectData.DDLProjectPreview = append(wsDDLprojectData.DDLProjectPreview, DDLProjectPreview)
 	}
-	fmt.Printf("GGGGGGGGGG %+v \n", len(projectInfos))
+	fmt.Printf("GGGGGGGGGG %+v %+v %+v \n", len(projectInfos), pageSize, pageNum)
 	return &wsDDLprojectData, nil
 }
+
+func GetWorkspaceBarNums(ctx context.Context, enterpriseID, projectType int64) (*http_model.WorkspaceBarNums, error) {
+	var workspaceNums http_model.WorkspaceBarNums
+	var DataPendingNum, LinkPendingNum, SketchPendingNum, ScriptPendingNum, AccSelecting, ShipmentPendingNum, ShippedNum int64
+	fmt.Printf("TypeShow %+v", projectType)
+	//先查企业所属的全部项目
+	var RecruitingProjectIDs []int64
+	db := GetReadDB(ctx)
+	db = db.Debug().Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_type = ?  AND project_status = 4", enterpriseID, projectType).Find(&RecruitingProjectIDs)
+
+	db1 := GetReadDB(ctx)
+	db1 = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ?", RecruitingProjectIDs)
+	//在一个db上持续操作，会默认一直AND连接
+
+	//1 招募中-待选
+	err := db1.Where("task_stage = 1").Count(&AccSelecting).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find AccSelecting error,err:%+v", err)
+		return nil, err
+	}
+
+	//执行中都是状态9 再次过滤
+	var ExecutingProjectIDs []int64
+
+	db = GetReadDB(ctx)
+	db = db.Debug().Model(gorm_model.ProjectInfo{}).Select("project_id").Where("enterprise_id = ? AND project_type = ?  AND project_status = 9", enterpriseID, projectType).Find(&ExecutingProjectIDs)
+	db1 = GetReadDB(ctx)
+	db1 = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ?", ExecutingProjectIDs)
+
+	//2 数据待审
+	db1 = GetReadDB(ctx)
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 14", ExecutingProjectIDs).Count(&DataPendingNum).Error
+	//err = db1.Where("task_stage = 14").Count(&DataPendingNum).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find DataPendingNum error,err:%+v", err)
+		return nil, err
+	}
+
+	//3 链接待审
+	db1 = GetReadDB(ctx)
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 12", ExecutingProjectIDs).Count(&LinkPendingNum).Error
+	//err = db1.Where("task_stage = 12").Count(&LinkPendingNum).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find LinkPendingNum error,err:%+v", err)
+		return nil, err
+	}
+
+	//4 初稿待审
+	db1 = GetReadDB(ctx)
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 10", ExecutingProjectIDs).Count(&SketchPendingNum).Error
+	//err = db1.Where("task_stage = 10").Count(&SketchPendingNum).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find SketchPendingNum error,err:%+v", err)
+		return nil, err
+	}
+
+	//5 脚本待审
+	db1 = GetReadDB(ctx)
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 8", ExecutingProjectIDs).Count(&ScriptPendingNum).Error
+	//err = db1.Where("task_stage = 8").Count(&ScriptPendingNum).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find ScriptPendingNum error,err:%+v", err)
+		return nil, err
+	}
+
+	//6 待签收
+	db1 = GetReadDB(ctx)
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ?  AND task_stage = 5", ExecutingProjectIDs).Count(&ShippedNum).Error
+	//err = db1.Where("task_stage = 5").Count(&ShippedNum).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find ShippedNum error,err:%+v", err)
+		return nil, err
+	}
+
+	//7 待发货
+	db1 = GetReadDB(ctx)
+	err = db1.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("project_id IN ? AND task_stage = 4", ExecutingProjectIDs).Count(&ShipmentPendingNum).Error
+	//err = db1.Where("task_stage = 4").Count(&ShipmentPendingNum).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetWorkspaceBarNums db] Find ShipmentPendingNum error,err:%+v", err)
+		return nil, err
+	}
+
+	workspaceNums.DataPendingNum = DataPendingNum
+	workspaceNums.LinkPendingNum = LinkPendingNum
+	workspaceNums.SketchPendingNum = SketchPendingNum
+	workspaceNums.ScriptPendingNum = ScriptPendingNum
+	workspaceNums.AccSelecting = AccSelecting
+	workspaceNums.ShippedNum = ShippedNum
+	workspaceNums.ShipmentPendingNum = ShipmentPendingNum
+
+	fmt.Printf("work %+v", workspaceNums)
+	return &workspaceNums, nil
+}

handler/WorkspaceDDLproject.go

@@ -36,7 +36,7 @@ func (w WorkspaceDDLprojectHandler) getRequest() interface{} {
 func (w WorkspaceDDLprojectHandler) run() {
 	auth := middleware.GetSessionAuth(w.ctx)
 	enterpriseID := auth.EnterpriseID
-	data, err := db.GetWorkspaceDDLproject(w.ctx, enterpriseID)
+	data, err := db.GetWorkspaceDDLproject(w.ctx, enterpriseID, w.req.PageSize, w.req.PageNum)
 	if err != nil {
 		// 数据库查询失败，返回5001
 		logrus.Errorf("[WorkspaceDDLprojectHandler] call GetWorkspaceDDLproject err:%+v\n", err)

handler/project_show.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"fmt"
 	"youngee_b_api/consts"
 	"youngee_b_api/model/http_model"
 	"youngee_b_api/service"
@@ -56,6 +57,7 @@ func (h *ShowProjectHandler) run() {
 	data = *h.req
 	//auth := middleware.GetSessionAuth(h.ctx)
 	//enterpriseID := auth.EnterpriseID
+	fmt.Printf("projectID %+v", data.ProjectID)
 	res, err := service.Project.GetPorjectDetail(h.ctx, data.ProjectID)
 	if err != nil {
 		logrus.Errorf("[ShowProjectHandler] call Show err:%+v\n", err)

handler/workspaceBarNums.go

@@ -0,0 +1,62 @@
+package handler
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/issue9/conv"
+	"github.com/sirupsen/logrus"
+	"youngee_b_api/consts"
+	"youngee_b_api/db"
+	"youngee_b_api/middleware"
+	"youngee_b_api/model/http_model"
+	"youngee_b_api/util"
+)
+
+func WrapWorkspaceBarNumsHandler(ctx *gin.Context) {
+	handler := newWorkspaceBarNumsHandler(ctx)
+	baseRun(handler)
+}
+
+type WorkspaceBarNumsHandler struct {
+	ctx  *gin.Context
+	req  *http_model.WorkspaceBarNumsRequest
+	resp *http_model.CommonResponse
+}
+
+func (w WorkspaceBarNumsHandler) getContext() *gin.Context {
+	return w.ctx
+}
+
+func (w WorkspaceBarNumsHandler) getResponse() interface{} {
+	return w.resp
+}
+
+func (w WorkspaceBarNumsHandler) getRequest() interface{} {
+	return w.req
+}
+
+func (w WorkspaceBarNumsHandler) run() {
+	auth := middleware.GetSessionAuth(w.ctx)
+	enterpriseID := auth.EnterpriseID
+	w.req.ProjectType = conv.MustInt64(w.req.ProjectType)
+	data, err := db.GetWorkspaceBarNums(w.ctx, enterpriseID, w.req.ProjectType)
+	if err != nil {
+		// 数据库查询失败，返回5001
+		logrus.Errorf("[WorkspaceBarNumsHandler] call GetWorkspaceBarNums err:%+v\n", err)
+		util.HandlerPackErrorResp(w.resp, consts.ErrorInternal, "")
+		logrus.Info("GetWorkspaceBarNums fail,req:%+v", w.req)
+		return
+	}
+	w.resp.Data = data
+}
+
+func (w WorkspaceBarNumsHandler) checkParam() error {
+	return nil
+}
+
+func newWorkspaceBarNumsHandler(ctx *gin.Context) *WorkspaceBarNumsHandler {
+	return &WorkspaceBarNumsHandler{
+		ctx:  ctx,
+		req:  http_model.NewWorkspaceBarNumsRequest(),
+		resp: http_model.NewWorkspaceBarNumsResponse(),
+	}
+}

handler/workspacePieNums.go

@@ -1,60 +0,0 @@
-package handler
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
-	"youngee_b_api/consts"
-	"youngee_b_api/db"
-	"youngee_b_api/middleware"
-	"youngee_b_api/model/http_model"
-	"youngee_b_api/util"
-)
-
-func WrapWorkspacePieNumsHandler(ctx *gin.Context) {
-	handler := newWorkspacePieNumsHandler(ctx)
-	baseRun(handler)
-}
-
-type WorkspacePieNumsHandler struct {
-	ctx  *gin.Context
-	req  *http_model.WorkspacePieNumsRequest
-	resp *http_model.CommonResponse
-}
-
-func (w WorkspacePieNumsHandler) getContext() *gin.Context {
-	return w.ctx
-}
-
-func (w WorkspacePieNumsHandler) getResponse() interface{} {
-	return w.resp
-}
-
-func (w WorkspacePieNumsHandler) getRequest() interface{} {
-	return w.req
-}
-
-func (w WorkspacePieNumsHandler) run() {
-	auth := middleware.GetSessionAuth(w.ctx)
-	enterpriseID := auth.EnterpriseID
-	data, err := db.GetWorkspacePieNums(w.ctx, enterpriseID)
-	if err != nil {
-		// 数据库查询失败，返回5001
-		logrus.Errorf("[WorkspacePieNumsHandler] call GetWorkspacePieNums err:%+v\n", err)
-		util.HandlerPackErrorResp(w.resp, consts.ErrorInternal, "")
-		logrus.Info("GetWorkspacePieNums fail,req:%+v", w.req)
-		return
-	}
-	w.resp.Data = data
-}
-
-func (w WorkspacePieNumsHandler) checkParam() error {
-	return nil
-}
-
-func newWorkspacePieNumsHandler(ctx *gin.Context) *WorkspacePieNumsHandler {
-	return &WorkspacePieNumsHandler{
-		ctx:  ctx,
-		req:  http_model.NewWorkspacePieNumsRequest(),
-		resp: http_model.NewWorkspacePieNumsResponse(),
-	}
-}

handler/workspacePieNums2.go

@@ -1,60 +0,0 @@
-package handler
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
-	"youngee_b_api/consts"
-	"youngee_b_api/db"
-	"youngee_b_api/middleware"
-	"youngee_b_api/model/http_model"
-	"youngee_b_api/util"
-)
-
-func WrapWorkspacePieNums2Handler(ctx *gin.Context) {
-	handler := newWorkspacePieNums2Handler(ctx)
-	baseRun(handler)
-}
-
-type WorkspacePieNums2Handler struct {
-	ctx  *gin.Context
-	req  *http_model.WorkspacePieNums2Request
-	resp *http_model.CommonResponse
-}
-
-func (w WorkspacePieNums2Handler) getContext() *gin.Context {
-	return w.ctx
-}
-
-func (w WorkspacePieNums2Handler) getResponse() interface{} {
-	return w.resp
-}
-
-func (w WorkspacePieNums2Handler) getRequest() interface{} {
-	return w.req
-}
-
-func (w WorkspacePieNums2Handler) run() {
-	auth := middleware.GetSessionAuth(w.ctx)
-	enterpriseID := auth.EnterpriseID
-	data, err := db.GetWorkspacePieNums2(w.ctx, enterpriseID)
-	if err != nil {
-		// 数据库查询失败，返回5001
-		logrus.Errorf("[WorkspacePieNums2Handler] call GetWorkspacePieNums2 err:%+v\n", err)
-		util.HandlerPackErrorResp(w.resp, consts.ErrorInternal, "")
-		logrus.Info("GetWorkspacePieNums2 fail,req:%+v", w.req)
-		return
-	}
-	w.resp.Data = data
-}
-
-func (w WorkspacePieNums2Handler) checkParam() error {
-	return nil
-}
-
-func newWorkspacePieNums2Handler(ctx *gin.Context) *WorkspacePieNums2Handler {
-	return &WorkspacePieNums2Handler{
-		ctx:  ctx,
-		req:  http_model.NewWorkspacePieNums2Request(),
-		resp: http_model.NewWorkspacePieNums2Response(),
-	}
-}

model/http_model/WorkspaceBarNums.go

@@ -0,0 +1,26 @@
+package http_model
+
+type WorkspaceBarNumsRequest struct {
+	ProjectType int64 `json:"project_type"` //项目类型
+}
+
+type WorkspaceBarNums struct {
+	DataPendingNum     int64 `json:"data_pending_num"`     // 执行中-数据待审
+	LinkPendingNum     int64 `json:"link_pending_num"`     // 执行中-链接待审
+	SketchPendingNum   int64 `json:"sketch_pending_num"`   // 执行中-初稿待审
+	ScriptPendingNum   int64 `json:"script_pending_num"`   // 执行中-脚本待审
+	AccSelecting       int64 `json:"acc_selecting"`        // 招募中-待选（账号待审）
+	ShippedNum         int64 `json:"shipped_num"`          // 执行中-待签收（已发货）
+	ShipmentPendingNum int64 `json:"shipment_pending_num"` // 执行中-待发货
+
+}
+
+func NewWorkspaceBarNumsRequest() *WorkspaceBarNumsRequest {
+	return new(WorkspaceBarNumsRequest)
+}
+
+func NewWorkspaceBarNumsResponse() *CommonResponse {
+	resp := new(CommonResponse)
+	resp.Data = new(WorkspaceBarNums)
+	return resp
+}

model/http_model/WorkspaceDDLproject.go

@@ -1,13 +1,18 @@
 package http_model
 
 type WorkspaceDDLprojectRequest struct {
+	PageSize int64 `json:"page_size"`
+	PageNum  int64 `json:"page_num"`
 }
 
 type WorkspaceDDLprojectdata struct {
 	DDLProjectPreview []*DDLProjectPreview `json:"DDL_project_pre_view"`
-	Total             string               `json:"total"`
+	//TDBillingPreview        []*TDBillingPreview        `json:"td_billing_preview"`
+	//TDRechargeRecordPreview []*TDRechargeRecordPreview `json:"td_recharge_record_preview"`
+	Total string `json:"total"`
 }
 
+// DDLProjectPreview 当天变化状态的项目
 type DDLProjectPreview struct {
 	ProjectId       string `json:"project_id"`       // 项目ID
 	ProjectName     string `json:"project_name"`     // 项目名
@@ -18,9 +23,23 @@ type DDLProjectPreview struct {
 	ProjectContentType string `json:"project_content_type"` // 内容形式
 	RecruitDDL         string `json:"recruit_ddl"`          //招募截止时间
 	RecruitNum         string `json:"recruit_num"`          //已招募人数
-	AutoFailAt         string `json:"auti_fail_at"`         //支付截止时间
+	AutoFailAt         string `json:"auto_fail_at"`         //支付截止时间
+	FinishAt           string `json:"finish_at"`            //结案时间
+	PassAt             string `json:"pass_at"`              //审核通过时间
 }
 
+//type TDBillingPreview struct {
+//	BillingID   string `json:"billing_id"`   //开票信息ID
+//	InvoiceType string `json:"invoice_type"` //发票类型
+//	BillingAt   string `json:"billing_at"`   //开票时间
+//}
+//
+//type TDRechargeRecordPreview struct {
+//	RechargeID     string `json:"recharge_id"`     //充值订单ID
+//	RechargeAmount string `json:"recharge_amount"` // 开票金额
+//	ConfirmAt      string `json:"confirm_at"`      // 充值确认时间
+//}
+
 func NewWorkspaceDDLprojectRequest() *WorkspaceDDLprojectRequest {
 	return new(WorkspaceDDLprojectRequest)
 }

model/http_model/WorkspacePieNums2Request.go

@@ -1,20 +0,0 @@
-package http_model
-
-type WorkspacePieNums2Request struct {
-}
-
-type WorkspacePieNums2 struct {
-	SketchPendingNum   int64 `json:"sketch_pending_num"`   // 初稿待审
-	AccSelecting       int64 `json:"acc_selecting"`        // 账号待审
-	ShipmentPendingNum int64 `json:"shipment_pending_num"` // 待发货数量
-}
-
-func NewWorkspacePieNums2Request() *WorkspacePieNums2Request {
-	return new(WorkspacePieNums2Request)
-}
-
-func NewWorkspacePieNums2Response() *CommonResponse {
-	resp := new(CommonResponse)
-	resp.Data = new(WorkspacePieNums2)
-	return resp
-}

model/http_model/WorkspacePieNumsRequest.go

@@ -1,20 +0,0 @@
-package http_model
-
-type WorkspacePieNumsRequest struct {
-}
-
-type WorkspacePieNums struct {
-	DataPendingNum   int64 `json:"data_pending_num"`   // 数据待审
-	LinkPendingNum   int64 `json:"link_pending_num"`   // 链接待审
-	ScriptPendingNum int64 `json:"script_pending_num"` // 脚本待审
-}
-
-func NewWorkspacePieNumsRequest() *WorkspacePieNumsRequest {
-	return new(WorkspacePieNumsRequest)
-}
-
-func NewWorkspacePieNumsResponse() *CommonResponse {
-	resp := new(CommonResponse)
-	resp.Data = new(WorkspacePieNums)
-	return resp
-}

route/init.go

@@ -105,8 +105,7 @@ func InitRoute(r *gin.Engine) {
 		m.POST("/project/getfinishnumberinfo", handler.WrapGetFinishNumberInfoHandler)       // 获取结案数量
 		m.POST("/project/transferToPublic", handler.WrapTransferToPublicHandler)             // 对公转账
 		m.GET("/workspace/headNums", handler.WrapWorkspaceHeadNumsHandler)                   // 工作台上面数字显示
-		m.GET("/workspace/pieNums", handler.WrapWorkspacePieNumsHandler)                     // 工作台饼图数字显示1
-		m.GET("/workspace/pieNums2", handler.WrapWorkspacePieNums2Handler)                   // 工作台饼图数字显示2
+		m.POST("/workspace/BarNums", handler.WrapWorkspaceBarNumsHandler)                    // 工作台柱状图数字显示
 
 		m.POST("/project/getSpecialInviteNumber", handler.WrapGetSpecialInviteNumberHandler) // 查询专项任务邀请管理任务数量
 		m.POST("/project/getSpecialReviewNumber", handler.WrapGetSpecialReviewNumberHandler) // 查询专项任务审稿管理任务数量
@@ -121,6 +120,6 @@ func InitRoute(r *gin.Engine) {
 		m.POST("/project/specialTaskFinishDataList", handler.WrapSpecialTaskFinishDataListHandler) // 查询专项任务结案数据任务列表
 
 		m.POST("/project/getspecialfinishdata", handler.WrapGetSpecialFinishDataHandler) // 查询专项任务结案单结案数据
-		m.GET("/workspace/ddlproject", handler.WrapWorkspaceDDLprojectHandler)           // 工作台项目统计
+		m.POST("/workspace/ddlproject", handler.WrapWorkspaceDDLprojectHandler)          // 工作台项目统计
 	}
 }

service/project.go

@@ -48,6 +48,7 @@ func (*project) Create(ctx context.Context, newProject http_model.CreateProjectR
 		//feeForm += string(strategy.StrategyID)
 	}
 	feeFroms := strings.Join(feeFrom, ",")
+	fmt.Printf("创建项目new %+v", newProject)
 	projectInfo := gorm_model.ProjectInfo{}
 	if newProject.ProjectType == int64(1) {
 		projectInfo = gorm_model.ProjectInfo{
@@ -263,6 +264,7 @@ func (*project) GetProjectTaskList(ctx context.Context, projectID string, pageSi
 }
 
 func (*project) GetPorjectDetail(ctx context.Context, projectID int64) (*http_model.ShowProjectData, error) {
+
 	project, err := db.GetProjectDetail(ctx, projectID)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[project service] call GetPorjectDetail error,err:%+v", err)