feat: 111

dao/safe_audit_dao.go

@@ -60,18 +60,17 @@ func (d *SafeAuditDao) GetAuditors(id int, times int) []viewmodels.Auditors {
 // 根据当前times，获取审批人(包括原报)
 func (d *SafeAuditDao) GetAuditorsWithOwner(id int, times int, cur_uid int) []viewmodels.Auditors {
 	auditors := make([]viewmodels.Auditors, 0)
-
-	// 原报
 	auditor := viewmodels.Auditors{Progress: ""}
 
-	_, err := d.engine.Sql("select name, position, id as `audit_id` from `cm_project_account` where id = ?", cur_uid).Get(&auditor)
+	_, err := d.engine.Sql("select name, company, position, id as `audit_id` from `cm_project_account` where id = ?", cur_uid).Get(&auditor)
 
 	if err != nil {
 		fmt.Println(err)
 	}
 	auditors = append(auditors, auditor)
-	d.engine.Sql("select pa.`name`, pa.`account_gourp`, pa.`position`,ca.`audit_id`, ca.`audit_order`, ca.`progress` from `cm_project_account` as pa, `cm_safe_audit` as ca where ca.`safe_id` = ? and ca.`times` = ? and ca.audit_id = pa.id order by `audit_order`", id, times).Find(&auditors)
 
+	d.engine.Sql("select pa.`company`, pa.`name`, pa.`account_group`, pa.`position`,ca.`audit_id` as `auditor_id`, ca.`id` as `audit_id`, ca.`status`, ca.`audit_order`, ca.`progress` from `cm_project_account` as pa, `cm_safe_audit` as ca where ca.`safe_id` = ? and ca.`times` = ? and ca.audit_id = pa.id order by `audit_order`", id, times).Find(&auditors)
+	// 原报
 	return auditors
 }
 

services/safe_audit.service.go

@@ -169,7 +169,14 @@ func (s *safeAuditService) StartAudit(safeId int, bidsectionId int, times int, a
 		data = append(data, auditVM)
 	}
 	err := s.daoSafeAudit.InsertData(data)
-	return err
+	if err != nil {
+		return err
+	}
+	err = s.daoSafe.ChangeStatus(safeId, 1, times)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 // 规则校验

services/safe_service.go

@@ -104,6 +104,8 @@ func (s *safeService) GetDetail(id int, pid int) viewmodels.SafeDetail {
 	account := s.daoProjectAccount.Get(safeData.Uid, pid)
 	data.AuditName = account.Name
 	data.CreateTime = safeData.CreateTime
+	data.Times = safeData.Times
+	data.Status = safeData.Status
 	fileList, total := s.daoAnnex.GetList(3, safeData.Id, 1, conf.PageSize)
 	// 加密id
 	fileArr := make([]viewmodels.AnnexListView, 0)
@@ -127,14 +129,17 @@ func (s *safeService) GetDetail(id int, pid int) viewmodels.SafeDetail {
 	encryptAuditors := make([]viewmodels.Auditors, 0)
 	for _, item := range auditors {
 		auditorVM := viewmodels.Auditors{}
+		auditorId, _ := comm.AesEncrypt(item.AuditorId, conf.SignSecret)
 		auditId, _ := comm.AesEncrypt(item.AuditId, conf.SignSecret)
+		auditorVM.AuditorId = auditorId
 		auditorVM.AuditId = auditId
 		auditorVM.Name = item.Name
 		auditorVM.Position = item.Position
 		auditorVM.AuditOrder = item.AuditOrder
 		auditorVM.AccountGroup = item.AccountGroup
 		auditorVM.Progress = item.Progress
-
+		auditorVM.Company = item.Company
+		auditorVM.Status = item.Status
 		encryptAuditors = append(encryptAuditors, auditorVM)
 	}
 	auditHistory := s.daoSafeAudit.GetAuditHistory(safeData.Id, safeData.Times)

web/viewmodels/safe.go

@@ -51,6 +51,7 @@ type SafeDetail struct {
 	Inspection       string                     `form:"inspection" json:"inspection"`
 	InspectionDetail string                     `form:"inspectionDetail" json:"inspectionDetail"`
 	Demand           string                     `form:"demand" json:"demand"`
+	Times            int                        `from:"times" json:"times"`
 	Status           int                        `form:"status" json:"status"`
 	AuditName        string                     `form:"auditName" json:"auditName"`
 	File             FileStruct                 `form:"file" json:"file"`
@@ -75,10 +76,13 @@ type SafeFile struct {
 type Auditors struct {
 	Name         string `from:"name" json:"name"`
 	Progress     string `from:"progress" json:"progress"`
-	AuditId      string `from:"audit_id" json:"audit_id"`
+	AuditorId    string `from:"auditor_id" json:"auditor_id"`
 	Position     string `from:"position" json:"position"`
 	AuditOrder   int    `from:"audit_order" json:"audit_order"`
 	AccountGroup int    `from:"account_group" json:"account_group"`
+	Company      string `from:"company" json:"company"`
+	Status       int    `from:"status" json:"status"`
+	AuditId      string `from:"audit_id" json:"audit_id"`
 }
 
 type SafeListAuditRecord struct {