|
|
@@ -54,7 +54,7 @@ func (d *QualityAuditDao) GetAuditHistory(id int, times int) map[int][]viewmodel
|
|
|
auditorHistory := make(map[int][]viewmodels.HistoryQualityAudit, 0)
|
|
|
for i := 1; i <= times; i++ {
|
|
|
auditors := make([]viewmodels.HistoryQualityAudit, 0)
|
|
|
- d.engine.Sql("select ca.`id`, pa.`name`, pa.`position`, ca.`create_time`, ca.progress, ca.opinion, ca.status from `cm_project_account` as pa, `cm_Quality_audit` as ca where ca.`Quality_id` = ? and ca.`audit_id` = pa.`id` and times = ? order by id desc", id, i).Find(&auditors)
|
|
|
+ d.engine.Sql("select ca.`id`, pa.`name`, pa.`position`, ca.`create_time`, ca.progress, ca.opinion, ca.status from `cm_project_account` as pa, `cm_quality_audit` as ca where ca.`quality_id` = ? and ca.`audit_id` = pa.`id` and times = ? order by id desc", id, i).Find(&auditors)
|
|
|
auditorsArr := make([]viewmodels.HistoryQualityAudit, 0)
|
|
|
for _, auditor := range auditors {
|
|
|
auditorVM := viewmodels.HistoryQualityAudit{}
|
|
|
@@ -83,7 +83,7 @@ func (d *QualityAuditDao) FindById(id int) (*models.CmQualityAudit, error) {
|
|
|
// 查找最新的整改单
|
|
|
func (d *QualityAuditDao) GetLastedOrder(QualityId 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.`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)
|
|
|
return data, err
|
|
|
}
|
|
|
|
|
|
@@ -103,6 +103,6 @@ func (d *QualityAuditDao) ChangeNextRecord(times int, audit_order int) error {
|
|
|
// 获取最后一个审批人
|
|
|
func (d *QualityAuditDao) GetLastAuditor(times int, QualityId int) (*models.CmQualityAudit, error) {
|
|
|
data := &models.CmQualityAudit{}
|
|
|
- _, err := d.engine.Where("times = ? and Quality_id = ?", times, QualityId).Desc("audit_order").Limit(1).Get(data)
|
|
|
+ _, err := d.engine.Where("times = ? and quality_id = ?", times, QualityId).Desc("audit_order").Limit(1).Get(data)
|
|
|
return data, err
|
|
|
}
|
