更新审批
This commit is contained in:
parent
7c54d3ce30
commit
129d3fafa1
@ -114,6 +114,7 @@ type System struct {
|
|||||||
HttpPort string
|
HttpPort string
|
||||||
Host string
|
Host string
|
||||||
RedirectUri string
|
RedirectUri string
|
||||||
|
ErpHost string
|
||||||
}
|
}
|
||||||
type Oss struct {
|
type Oss struct {
|
||||||
AccessKeyId string
|
AccessKeyId string
|
||||||
|
@ -4,7 +4,7 @@ AppMode = "dev"
|
|||||||
HttpPort = ":8085"
|
HttpPort = ":8085"
|
||||||
Host = "https://common.szjixun.cn"
|
Host = "https://common.szjixun.cn"
|
||||||
RedirectUri = "/api/redirect/url"
|
RedirectUri = "/api/redirect/url"
|
||||||
|
ErpHost = "http://114.218.158.24:9020"
|
||||||
[bos]
|
[bos]
|
||||||
Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
|
Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
|
||||||
Sk = "d2ecaa9d75114d3b9f42b99014198306"
|
Sk = "d2ecaa9d75114d3b9f42b99014198306"
|
||||||
|
@ -4,7 +4,7 @@ AppMode = "prod"
|
|||||||
HttpPort = ":8085"
|
HttpPort = ":8085"
|
||||||
Host = "https://common.szjixun.cn"
|
Host = "https://common.szjixun.cn"
|
||||||
RedirectUri = "/api/redirect/url"
|
RedirectUri = "/api/redirect/url"
|
||||||
|
ErpHost = "https://erpapi.fontree.cn"
|
||||||
[bos]
|
[bos]
|
||||||
Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
|
Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
|
||||||
Sk = "d2ecaa9d75114d3b9f42b99014198306"
|
Sk = "d2ecaa9d75114d3b9f42b99014198306"
|
||||||
|
@ -4,7 +4,7 @@ AppMode = "test"
|
|||||||
HttpPort = ":8085"
|
HttpPort = ":8085"
|
||||||
Host = "https://common.szjixun.cn"
|
Host = "https://common.szjixun.cn"
|
||||||
RedirectUri = "/api/redirect/url"
|
RedirectUri = "/api/redirect/url"
|
||||||
|
ErpHost = "http://114.218.158.24:9020"
|
||||||
[bos]
|
[bos]
|
||||||
Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
|
Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
|
||||||
Sk = "d2ecaa9d75114d3b9f42b99014198306"
|
Sk = "d2ecaa9d75114d3b9f42b99014198306"
|
||||||
|
24
pkg/model/cast/approval.go
Normal file
24
pkg/model/cast/approval.go
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
package cast
|
||||||
|
|
||||||
|
type ApprovalDetailResponse struct {
|
||||||
|
Status int `json:"status"`
|
||||||
|
Data Data `json:"data"`
|
||||||
|
Msg string `json:"msg"`
|
||||||
|
Code int `json:"code"`
|
||||||
|
Error *string `json:"error"`
|
||||||
|
Err string `json:"err"`
|
||||||
|
Keys []string `json:"keys"`
|
||||||
|
Positions *interface{} `json:"positions"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Data struct {
|
||||||
|
Count int `json:"Count"`
|
||||||
|
Data []Item `json:"data"`
|
||||||
|
Status int `json:"Status"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Item struct {
|
||||||
|
ID int `json:"ID"`
|
||||||
|
Domain string `json:"Domain"`
|
||||||
|
Status int `json:"Status"`
|
||||||
|
}
|
39
pkg/service/cast/approval.go
Normal file
39
pkg/service/cast/approval.go
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
package cast
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"fonchain-fiee/cmd/config"
|
||||||
|
"fonchain-fiee/pkg/e"
|
||||||
|
"fonchain-fiee/pkg/utils"
|
||||||
|
modelCast "fonchain-fiee/pkg/model/cast"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CastService struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *CastService) ApprovalDetail(approvalIds []int) (data map[int]int, err error) {
|
||||||
|
idsBytes, _ := json.Marshal(approvalIds)
|
||||||
|
var respBody string
|
||||||
|
url := fmt.Sprintf(config.AppConfig.System.ErpHost + "/approval/list/ex")
|
||||||
|
respBody, err = utils.Post(url, string(idsBytes))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var respDetail modelCast.ApprovalDetailResponse
|
||||||
|
if err = json.Unmarshal([]byte(respBody), &respDetail); err != nil {
|
||||||
|
err = errors.New(e.GetMsg(e.JsonUnmarshal))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if respDetail.Status == 0 && len(respDetail.Data.Data) > 0 {
|
||||||
|
data = make(map[int]int, len(respDetail.Data.Data))
|
||||||
|
for _, v := range respDetail.Data.Data {
|
||||||
|
data[v.ID] = v.Status
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
err = errors.New(e.GetMsg(e.ErrorHttp))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
@ -81,13 +81,14 @@ func UpdateWorkVideo(ctx *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func UpdateApproval(ctx *gin.Context) {
|
func UpdateApproval(ctx *gin.Context) {
|
||||||
var req *cast.UpdateApprovalReq
|
var req *cast.UpdateStatusReq
|
||||||
var err error
|
var err error
|
||||||
if err = ctx.ShouldBind(&req); err != nil {
|
if err = ctx.ShouldBind(&req); err != nil {
|
||||||
service.Error(ctx, err)
|
service.Error(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
resp, err := service.CastProvider.UpdateApproval(ctx, req)
|
req.WorkAction = cast.WorkActionENUM_APPROVAL
|
||||||
|
resp, err := service.CastProvider.UpdateStatus(ctx, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
service.Error(ctx, err)
|
service.Error(ctx, err)
|
||||||
return
|
return
|
||||||
|
34
pkg/utils/http.go
Normal file
34
pkg/utils/http.go
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
package utils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"io/ioutil"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Post(url, data string) (string, error) {
|
||||||
|
reader := bytes.NewReader([]byte(data))
|
||||||
|
|
||||||
|
request, err := http.NewRequest("POST", url, reader)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer request.Body.Close() //程序在使用完回复后必须关闭回复的主体
|
||||||
|
request.Header.Set("Content-Type", "application/json;charset=UTF-8")
|
||||||
|
//必须设定该参数,POST参数才能正常提交,意思是以json串提交数据
|
||||||
|
|
||||||
|
client := http.Client{}
|
||||||
|
resp, err := client.Do(request) //Do 方法发送请求,返回 HTTP 回复
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
respBytes, err := ioutil.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
//byte数组直接转成string,优化内存
|
||||||
|
// str := (*string)(unsafe.Pointer(&respBytes))
|
||||||
|
return string(respBytes), nil
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user