1

services/safe_service.go

@@ -362,15 +362,15 @@ func (s *safeService) GetPending(projectId int, projectAccountId int) []viewmode
 		approverVM := viewmodels.Approver{}
 
 		Id, _ := comm.AesEncrypt(strconv.Itoa(item.Id), conf.SignSecret)
-		BidsectionId, _ := comm.AesEncrypt(strconv.Itoa(item.BidsectionId), conf.SignSecret)
+		// BidsectionId, _ := comm.AesEncrypt(strconv.Itoa(item.BidsectionId), conf.SignSecret)
 		// AuditId, _ := comm.AesEncrypt(item.AuditId, conf.SignSecret)
-		ProjectId, _ := comm.AesEncrypt(strconv.Itoa(item.ProjectId), conf.SignSecret)
+		// ProjectId, _ := comm.AesEncrypt(strconv.Itoa(item.ProjectId), conf.SignSecret)
 		DataId, _ := comm.AesEncrypt(strconv.Itoa(item.DataId), conf.SignSecret)
 		// ProjectId, _ := comm.AesEncrypt(strconv.Itoa(item.ProjectId), conf.SignSecret)
 
 		approverVM.Id = Id
-		approverVM.ProjectId = ProjectId
-		approverVM.BidsectionId = BidsectionId
+		// approverVM.ProjectId = ProjectId
+		// approverVM.BidsectionId = BidsectionId
 		approverVM.DataType = item.DataType
 		approverVM.DataId = DataId
 		approverVM.Status = item.Status

web/viewmodels/approver.go

@@ -7,15 +7,15 @@
 package viewmodels
 
 type Approver struct {
-	Id           string `from:"id" json:"id"`
-	ProjectId    string `from:"project_id" json:"project_id"`
-	BidsectionId string `from:"bidsection_id" json:"bidsection_id"`
-	DataType     int    `from:"data_type" json:"data_type"`
-	DataId       string `from:"data_id" json:"data_id"`
-	Status       int    `from:"status" json:"status"`
-	Progress     string `from:"progress" json:"progress"`
-	AuditOrder   int    `from:"audit_order" json:"audit_order"`
-	AuditId      string `from:"audit_id" json:"audit_id"`
+	Id string `from:"id" json:"id"`
+	// ProjectId    string `from:"projectId" json:"projectId"`
+	// BidsectionId string `from:"bidsectionId" json:"bidsectionId"`
+	DataType int    `from:"dataType" json:"dataType"`
+	DataId   string `from:"dataId" json:"dataId"`
+	Status   int    `from:"status" json:"status"`
+	// Progress     string `from:"progress" json:"progress"`
+	// AuditOrder   int    `from:"auditOrder" json:"auditOrder"`
+	// AuditId      string `from:"auditId" json:"auditId"`
 
 	Code             string `from:"code" json:"code"`
 	InspectionDetail string `from:"inspectionDetail" json:"inspectionDetail"`