|
@@ -2,13 +2,16 @@ package controller
|
|
|
|
|
|
import (
|
|
import (
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/gin-gonic/gin"
|
|
|
|
+ "github.com/sirupsen/logrus"
|
|
"youngee_b_api/app/service"
|
|
"youngee_b_api/app/service"
|
|
|
|
+ "youngee_b_api/app/vo"
|
|
)
|
|
)
|
|
|
|
|
|
type WorkspaceController struct{}
|
|
type WorkspaceController struct{}
|
|
|
|
|
|
type GetTakegoodsInfoParam struct {
|
|
type GetTakegoodsInfoParam struct {
|
|
EnterpriseId string `json:"enterprise_id"`
|
|
EnterpriseId string `json:"enterprise_id"`
|
|
|
|
+ SubAccountId int64 `json:"sub_account_id"`
|
|
DateRange string `json:"days"`
|
|
DateRange string `json:"days"`
|
|
}
|
|
}
|
|
|
|
|
|
@@ -16,6 +19,7 @@ func (w WorkspaceController) GetTakegoodsInfo(c *gin.Context) {
|
|
search := &GetTakegoodsInfoParam{}
|
|
search := &GetTakegoodsInfoParam{}
|
|
err := c.BindJSON(&search)
|
|
err := c.BindJSON(&search)
|
|
if err != nil {
|
|
if err != nil {
|
|
|
|
+ logrus.Errorf("Request bind err:%+v\n", err)
|
|
returnError(c, 40000, "Parameter Error: "+err.Error())
|
|
returnError(c, 40000, "Parameter Error: "+err.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -23,3 +27,71 @@ func (w WorkspaceController) GetTakegoodsInfo(c *gin.Context) {
|
|
|
|
|
|
returnSuccess(c, 20000, result)
|
|
returnSuccess(c, 20000, result)
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+// 任务待办-公开任务
|
|
|
|
+func (t WorkspaceController) GetPublicTask(c *gin.Context) {
|
|
|
|
+ param := &vo.CommonParam{}
|
|
|
|
+ err := c.BindJSON(param)
|
|
|
|
+ if err != nil {
|
|
|
|
+ logrus.Errorf("Request bind err:%+v\n", err)
|
|
|
|
+ returnError(c, 40000, "Parameter Error: "+err.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ selectionToDo, err1 := service.SelectionInfoService{}.GetSelectionToDo(param.EnterpriseId, param.SubAccountId)
|
|
|
|
+ if err1 != nil {
|
|
|
|
+ logrus.Errorf("[SelectionInfoService] call Show err:%+v\n", err1)
|
|
|
|
+ returnError(c, 40000, err1.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ projectToDo, err2 := service.ProjectService{}.GetProjectToDo(param.EnterpriseId, param.SubAccountId, 1)
|
|
|
|
+ if err2 != nil {
|
|
|
|
+ logrus.Errorf("[ProjectService] call Show err:%+v\n", err2)
|
|
|
|
+ returnError(c, 40000, err2.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ localLifeToDo, err3 := service.LocalLifeService{}.GetLocalLifeToDo(param.EnterpriseId, param.SubAccountId, 1)
|
|
|
|
+ if err3 != nil {
|
|
|
|
+ logrus.Errorf("[LocalLifeService] call Show err:%+v\n", err3)
|
|
|
|
+ returnError(c, 40000, err3.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ resultMap := make(map[string]*map[string]map[string]int64)
|
|
|
|
+ resultMap["selectionToDo"] = &selectionToDo
|
|
|
|
+ resultMap["projectToDo"] = &projectToDo
|
|
|
|
+ resultMap["localLifeToDo"] = &localLifeToDo
|
|
|
|
+ returnSuccess(c, 20000, resultMap)
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+// 任务待办-定向任务
|
|
|
|
+func (t WorkspaceController) GetTargetTask(c *gin.Context) {
|
|
|
|
+ param := &vo.CommonParam{}
|
|
|
|
+ err := c.BindJSON(param)
|
|
|
|
+ if err != nil {
|
|
|
|
+ logrus.Errorf("Request bind err:%+v\n", err)
|
|
|
|
+ returnError(c, 40000, "Parameter Error: "+err.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ selectionToDo, err1 := service.SelectionInfoService{}.GetSelectionToDo(param.EnterpriseId, param.SubAccountId)
|
|
|
|
+ if err1 != nil {
|
|
|
|
+ logrus.Errorf("[SelectionInfoService] call Show err:%+v\n", err1)
|
|
|
|
+ returnError(c, 40000, err1.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ projectToDo, err2 := service.ProjectService{}.GetProjectToDo(param.EnterpriseId, param.SubAccountId, 2)
|
|
|
|
+ if err2 != nil {
|
|
|
|
+ logrus.Errorf("[ProjectService] call Show err:%+v\n", err2)
|
|
|
|
+ returnError(c, 40000, err2.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ localLifeToDo, err3 := service.LocalLifeService{}.GetLocalLifeToDo(param.EnterpriseId, param.SubAccountId, 2)
|
|
|
|
+ if err3 != nil {
|
|
|
|
+ logrus.Errorf("[LocalLifeService] call Show err:%+v\n", err3)
|
|
|
|
+ returnError(c, 40000, err3.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ resultMap := make(map[string]*map[string]map[string]int64)
|
|
|
|
+ resultMap["selectionToDo"] = &selectionToDo
|
|
|
|
+ resultMap["projectToDo"] = &projectToDo
|
|
|
|
+ resultMap["localLifeToDo"] = &localLifeToDo
|
|
|
|
+ returnSuccess(c, 20000, resultMap)
|
|
|
|
+}
|