fix: 11111

dao/safe_audit_dao.go

@@ -79,7 +79,7 @@ func (d *SafeAuditDao) GetAuditHistory(id int, times int) map[int][]viewmodels.H
 	auditorHistory := make(map[int][]viewmodels.HistorySafeAudit, 0)
 	for i := 1; i <= times; i++ {
 		auditors := make([]viewmodels.HistorySafeAudit, 0)
-		d.engine.Sql("select ca.`id`, pa.`name`, pa.`position`, ca.`create_time` as createTime, ca.`end_time` as endTime, ca.`opinion`, ca.`status` from `cm_project_account` as pa, `cm_safe_audit` as ca where ca.`safe_id` = ? and ca.audit_id = pa.id and times = ? order by `audit_order`", id, times).Find(&auditors)
+		d.engine.Sql("select ca.`id`, pa.`name`, pa.`position`, ca.`create_time` as createTime, ca.`end_time` as endTime, ca.`progress`, ca.`opinion`, ca.`status` from `cm_project_account` as pa, `cm_safe_audit` as ca where ca.`safe_id` = ? and ca.audit_id = pa.id and times = ? order by `audit_order`", id, i).Find(&auditors)
 		auditorsArr := make([]viewmodels.HistorySafeAudit, 0)
 		for _, auditor := range auditors {
 			auditorVM := viewmodels.HistorySafeAudit{}
@@ -91,6 +91,7 @@ func (d *SafeAuditDao) GetAuditHistory(id int, times int) map[int][]viewmodels.H
 			auditorVM.Position = auditor.Position
 			auditorVM.Status = auditor.Status
 			auditorVM.Opinion = auditor.Opinion
+			auditorVM.Progress = auditor.Progress
 			auditorsArr = append(auditorsArr, auditorVM)
 		}
 		auditorHistory[i] = auditorsArr

web/viewmodels/safe_audit.go

@@ -35,6 +35,7 @@ type HistorySafeAudit struct {
 	EndTime    time.Time `from:"end_time" json:"end_time"`
 	Opinion    string    `from:"opinion" json:"opinion"`
 	Status     int       `from:"status" json:"status"`
+	Progress   string    `from:"progress" json:"progress"`
 }
 
 type LatestAuditorVM struct {