11

dao/approver_dao.go

@@ -508,6 +508,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 				rectification.ProjectId = safe.ProjectId
 				rectification.DataId = safe.Id
 				rectification.DataType = 0
+				rectification.AccountId = auditor.AuditId
 				rectification.CreateTime = time.Now()
 				newRectifiedTime, _ := time.Parse("2006-01-02 15:04:05", rectifiedTime)
 				rectification.RectifiedTime = newRectifiedTime
@@ -646,6 +647,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 				rectification.ProjectId = quality.ProjectId
 				rectification.DataId = quality.Id
 				rectification.DataType = 1
+				rectification.AccountId = auditor.AuditId
 				rectification.CreateTime = time.Now()
 				newRectifiedTime, _ := time.Parse("2006-01-02 15:04:05", rectifiedTime)
 				rectification.RectifiedTime = newRectifiedTime

dao/quality_audit_dao.go

@@ -80,10 +80,10 @@ func (d *QualityAuditDao) FindById(id int) (*models.CmQualityAudit, error) {
 	return data, err
 }
 
-// 查找最新的整改单
-func (d *QualityAuditDao) GetLastedOrder(QualityId int) ([]viewmodels.CheckOrderVM, error) {
+// 查找最新的整改单列表
+func (d *QualityAuditDao) GetRectifications(dataId int, dataType int) ([]viewmodels.CheckOrderVM, error) {
 	data := make([]viewmodels.CheckOrderVM, 0)
-	err := d.engine.Sql("select cm.`rectifiedInfo` as opinion, cm.`create_time`, pa.`name` from `cm_quality_audit` as cm left join `cm_project_account` as pa on pa.`id` = cm.`audit_id` where cm.`quality_id` = ? and cm.`progress` = ?", QualityId, 2).Find(&data)
+	err := d.engine.Sql("select cm.`rectifiedInfo` as opinion, cm.`rectified_time` as `create_time`, pa.`name` from `cm_rectification` as cm left join `cm_project_account` as pa on pa.`id` = cm.`account_id` where cm.`data_id` = ? and `data_type` = ? ", dataId, dataType).Find(&data)
 	return data, err
 }
 

dao/safe_audit_dao.go

@@ -80,10 +80,10 @@ func (d *SafeAuditDao) FindById(id int) (*models.CmSafeAudit, error) {
 	return data, err
 }
 
-// 查找最新的整改单
-func (d *SafeAuditDao) GetLastedOrder(safeId int) ([]viewmodels.CheckOrderVM, error) {
+// 查找最新的整改单列表
+func (d *SafeAuditDao) GetRectifications(dataId int, dataType int) ([]viewmodels.CheckOrderVM, error) {
 	data := make([]viewmodels.CheckOrderVM, 0)
-	err := d.engine.Sql("select cm.`rectifiedInfo` as opinion, cm.`create_time`, pa.`name` from `cm_safe_audit` as cm left join `cm_project_account` as pa on pa.`id` = cm.`audit_id` where cm.`safe_id` = ? and cm.`progress` = ?", safeId, 2).Find(&data)
+	err := d.engine.Sql("select cm.`rectifiedInfo` as opinion, cm.`rectified_time` as `create_time`, pa.`name` from `cm_rectification` as cm left join `cm_project_account` as pa on pa.`id` = cm.`account_id` where cm.`data_id` = ? and `data_type` = ? ", dataId, dataType).Find(&data)
 	return data, err
 }
 

services/quality_service.go

@@ -153,7 +153,7 @@ func (s *qualityService) GetDetail(id int, pid int) viewmodels.QualityDetail {
 	auditHistory := s.daoQualityAudit.GetAuditHistory(qualityData.Id, qualityData.Times)
 	data.AuditHistory = auditHistory
 	// 整改单
-	rectifiedInfo, _ := s.daoQualityAudit.GetLastedOrder(qualityData.Id)
+	rectifiedInfo, _ := s.daoQualityAudit.GetRectifications(qualityData.Id, 2)
 	data.RectifiedInfo = rectifiedInfo
 
 	// 最新审批人信息

services/safe_service.go

@@ -171,7 +171,7 @@ func (s *safeService) GetDetail(id int, pid int) viewmodels.SafeDetail {
 	auditHistory := s.daoSafeAudit.GetAuditHistory(safeData.Id, safeData.Times)
 	data.AuditHistory = auditHistory
 	// 整改单
-	rectifiedInfo, _ := s.daoSafeAudit.GetLastedOrder(safeData.Id)
+	rectifiedInfo, _ := s.daoSafeAudit.GetRectifications(safeData.Id, 1)
 	data.RectifiedInfo = rectifiedInfo
 
 	// 最新审批人信息

web/api/quality_audit_api.go

@@ -245,7 +245,7 @@ func (c *QualityAuditApi) PostPass() {
 		return
 	}
 	// 4. 执行sql
-	err = c.QualityAuditService.PassAudit(id, uid, auditId, qualityAuditData.Opinion, qualityAuditData.RectifiedInfo, qualityAuditData.rectifiedTime)
+	err = c.QualityAuditService.PassAudit(id, uid, auditId, qualityAuditData.Opinion, qualityAuditData.RectifiedInfo, qualityAuditData.RectifiedTime)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return

web/viewmodels/quality_audit.go

@@ -25,7 +25,7 @@ type QualityAudit struct {
 	Progress      string    `form:"progress" json:"progress"`
 	Opinion       string    `form:"opinion" json:"opinion"`
 	RectifiedInfo string    `form:"rectifiedInfo" json:"rectifiedInfo"`
-	TectifiedTime string    `from:"rectifiedTime" json:"rectifiedTime"`
+	RectifiedTime string    `from:"rectifiedTime" json:"rectifiedTime"`
 }
 
 type HistoryQualityAudit struct {