|
@@ -10,9 +10,10 @@ import (
|
|
|
)
|
|
|
|
|
|
type JlBb struct {
|
|
|
- Ctx iris.Context
|
|
|
- ServiceTree services.TreeService
|
|
|
- ServiceProject services.ProjectService
|
|
|
+ Ctx iris.Context
|
|
|
+ ServiceTree services.TreeService
|
|
|
+ ServiceProject services.ProjectService
|
|
|
+ ServiceContract services.ContractService
|
|
|
}
|
|
|
|
|
|
// @Summary 获得合同目录和标段
|
|
@@ -75,7 +76,7 @@ func (c *JlBb) GetFolder() {
|
|
|
// @Param key path string true "是一个数组,里面代表的名称"
|
|
|
// @Success 200 {object} viewmodels.FolderContract "{code:0成功,-1参数类错误,data:viewmodels.ProjectAccount,msg:错误信息}"
|
|
|
// @Router /api/contract/folder [get]
|
|
|
-func (c *JlBb) GetFolder2() {
|
|
|
+func (c *JlBb) GetContract() {
|
|
|
|
|
|
// 1.获得数据
|
|
|
data := &viewmodels.Jl{}
|
|
@@ -84,13 +85,8 @@ func (c *JlBb) GetFolder2() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // 1-1.校验是否存在code
|
|
|
- if err := data.ValidateCodeAToken(); err != nil {
|
|
|
- c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
|
|
|
- return
|
|
|
- }
|
|
|
// 1-2.验证jwt
|
|
|
- _, err := utils.ValidateJwt(data.Token)
|
|
|
+ err := utils.ValidateJwtBB(data.Token)
|
|
|
if err != nil {
|
|
|
c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
|
|
|
return
|
|
@@ -106,12 +102,15 @@ func (c *JlBb) GetFolder2() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // 获得层级文件夹
|
|
|
- FolderData := c.ServiceTree.GetAllContractByJL(projectDetail.Id)
|
|
|
+ data.BidsectionId = []string{"57", "58"}
|
|
|
+ data.Key = []string{"treeContracts", "contracts"}
|
|
|
+
|
|
|
+ JlService := services.NewJlService()
|
|
|
+ result := JlService.GetTableInfo(data, projectDetail.Id)
|
|
|
|
|
|
c.Ctx.JSON(iris.Map{
|
|
|
"code": 0,
|
|
|
"msg": "",
|
|
|
- "data": FolderData,
|
|
|
+ "data": result,
|
|
|
})
|
|
|
}
|