1

dao/approver_dao.go

@@ -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()

dao/quality_audit_dao.go

@@ -81,9 +81,9 @@ func (d *QualityAuditDao) FindById(id int) (*models.CmQualityAudit, error) {
 }
 
 // 查找最新的整改单列表
-func (d *QualityAuditDao) GetRectifications(dataId int, dataType int) ([]viewmodels.CheckOrderVM, error) {
+func (d *QualityAuditDao) GetRectifications(bid int, pid int, dataId int, dataType int) ([]viewmodels.CheckOrderVM, error) {
 	data := make([]viewmodels.CheckOrderVM, 0)
-	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)
+	err := d.engine.Sql("select cm.`content` 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.`bidsection_id` = ? and cm.`project_id` = ? and cm.`data_id` = ? and cm.`data_type` = ? ", bid, pid, dataId, dataType).Find(&data)
 	return data, err
 }
 

dao/safe_audit_dao.go

@@ -81,9 +81,9 @@ func (d *SafeAuditDao) FindById(id int) (*models.CmSafeAudit, error) {
 }
 
 // 查找最新的整改单列表
-func (d *SafeAuditDao) GetRectifications(dataId int, dataType int) ([]viewmodels.CheckOrderVM, error) {
+func (d *SafeAuditDao) GetRectifications(bid int, pid int, dataId int, dataType int) ([]viewmodels.CheckOrderVM, error) {
 	data := make([]viewmodels.CheckOrderVM, 0)
-	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)
+	err := d.engine.Sql("select cm.`content` 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` cm.`bidsection_id` = ? and cm.`project_id` = ? and cm.`data_id` = ? and cm.`data_type` = ? ", bid, pid, dataId, dataType).Find(&data)
 	return data, err
 }
 

models/cm_approver.go

@@ -15,5 +15,5 @@ type CmApprover struct {
 	AuditOrder   int       `xorm:"comment('审批顺序') INT(11)"`
 	AuditId      int       `xorm:"comment('审核人id') INT(11)"`
 	CreateTime   time.Time `xorm:"comment('创建时间') DATETIME"`
-	UpdateTime   time.Time `xorm:"not null default 'CURRENT_TIMESTAMP' comment('更新时间') TIMESTAMP"`
+	UpdateTime   time.Time `xorm:"default 'CURRENT_TIMESTAMP' comment('更新时间') TIMESTAMP"`
 }

models/cm_rectification.go

@@ -15,5 +15,5 @@ type CmRectification struct {
 	Content       string    `xorm:"comment('内容') VARCHAR(3072)"`
 	RectifiedTime time.Time `xorm:"comment('整改时间') DATETIME"`
 	CreateTime    time.Time `xorm:"comment('创建时间') DATETIME"`
-	UpdateTime    time.Time `xorm:"not null default 'CURRENT_TIMESTAMP' comment('更新时间') TIMESTAMP"`
+	UpdateTime    time.Time `xorm:"default 'CURRENT_TIMESTAMP' comment('更新时间') TIMESTAMP"`
 }

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.GetRectifications(qualityData.Id, 2)
+	rectifiedInfo, _ := s.daoQualityAudit.GetRectifications(qualityData.BidsectionId, qualityData.ProjectId, 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.GetRectifications(safeData.Id, 1)
+	rectifiedInfo, _ := s.daoSafeAudit.GetRectifications(safeData.BidsectionId, safeData.ProjectId, safeData.Id, 1)
 	data.RectifiedInfo = rectifiedInfo
 
 	// 最新审批人信息

web/api/quality_audit_api.go

@@ -219,6 +219,9 @@ func (c *QualityAuditApi) PostBack() {
 func (c *QualityAuditApi) PostPass() {
 	// 1.规则验证
 	qualityAuditData, err := c.QualityAuditService.ValidRule(c.Ctx)
+	fmt.Println("---------------------------------------------------------")
+	fmt.Println(qualityAuditData.RectifiedTime)
+	fmt.Println("---------------------------------------------------------")
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return