caipin пре 4 година
родитељ
комит
f64471bb22
3 измењених фајлова са 4 додато и 0 уклоњено
  1. 1 0
      go.mod
  2. 2 0
      services/safe_service.go
  3. 1 0
      web/viewmodels/approver.go

+ 1 - 0
go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/go-xorm/xorm v0.7.9
 	github.com/golang/protobuf v1.4.3
 	github.com/gomodule/redigo v1.8.2
+	github.com/gorilla/websocket v1.4.2
 	github.com/iris-contrib/middleware/csrf v0.0.0-20200913183508-5d1bed0e6ea4
 	github.com/iris-contrib/middleware/jwt v0.0.0-20200913183508-5d1bed0e6ea4
 	github.com/iris-contrib/swagger/v12 v12.2.0-alpha

+ 2 - 0
services/safe_service.go

@@ -384,6 +384,7 @@ func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmode
 					approverVM.InspectionDetail = data.InspectionDetail
 					approverVM.Name = data.AuditName
 					approverVM.Position = data.Position
+					approverVM.Inspection = data.Inspection
 					approverVM.CreateTime = data.CreateTime
 					break
 				}
@@ -395,6 +396,7 @@ func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmode
 					approverVM.InspectionDetail = data.InspectionDetail
 					approverVM.Name = data.AuditName
 					approverVM.Position = data.Position
+					approverVM.Inspection = data.Inspection
 					approverVM.CreateTime = data.CreateTime
 					break
 				}

+ 1 - 0
web/viewmodels/approver.go

@@ -32,6 +32,7 @@ type ApproverMessage struct {
 	Status   int    `from:"status" json:"status"`
 
 	Code             string `from:"code" json:"code"`
+	Inspection       string `from:"inspection" json:"inspection"`
 	InspectionDetail string `from:"inspectionDetail" json:"inspectionDetail"`
 	Name             string `from:"name" json:"name"`
 	Position         string `from:"position" json:"position"`