|
@@ -502,18 +502,19 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
- // 将整改单的状态->完成,并且填入整改日期
|
|
|
- rectification := &models.CmRectification{}
|
|
|
- rectification.BidsectionId = safe.BidsectionId
|
|
|
- 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
|
|
|
- rectification.Content = content
|
|
|
- rectification.Status = 1
|
|
|
+ // 将整改单的状态->完成,并且填入整改日期
|
|
|
+ rectification := &models.CmRectification{
|
|
|
+ BidsectionId: safe.BidsectionId,
|
|
|
+ ProjectId: safe.ProjectId,
|
|
|
+ DataId: safe.Id,
|
|
|
+ DataType: 1,
|
|
|
+ AccountId: auditor.AuditId,
|
|
|
+ RectifiedTime: newRectifiedTime,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ Content: content,
|
|
|
+ Status: 1,
|
|
|
+ }
|
|
|
_, err = session.Insert(rectification)
|
|
|
if err != nil {
|
|
|
session.Rollback()
|
|
@@ -642,17 +643,24 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
|
|
|
}
|
|
|
|
|
|
// 将整改单的状态->完成,并且填入整改日期
|
|
|
- rectification := &models.CmRectification{}
|
|
|
- rectification.BidsectionId = quality.BidsectionId
|
|
|
- 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
|
|
|
- rectification.Content = content
|
|
|
- rectification.Status = 1
|
|
|
+
|
|
|
+ newRectifiedTime, err := time.Parse("2006-01-02 15:04:05", rectifiedTime)
|
|
|
+ if err != nil {
|
|
|
+ session.Rollback()
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ rectification := &models.CmRectification{
|
|
|
+ BidsectionId: quality.BidsectionId,
|
|
|
+ ProjectId: quality.ProjectId,
|
|
|
+ DataId: quality.Id,
|
|
|
+ DataType: 2,
|
|
|
+ AccountId: auditor.AuditId,
|
|
|
+ CreateTime: time.Now(),
|
|
|
+ RectifiedTime: newRectifiedTime,
|
|
|
+ Content: content,
|
|
|
+ Status: 1,
|
|
|
+ }
|
|
|
_, err = session.Insert(rectification)
|
|
|
if err != nil {
|
|
|
session.Rollback()
|