lanjianrong 4 år sedan
förälder
incheckning
2d388a111b

+ 41 - 6
dao/approver_dao.go

@@ -371,7 +371,7 @@ func (d *ApproverDao) InitStatus(auditType string, bid int, dataType int, dataId
 }
 }
 
 
 // 审批通过
 // 审批通过
-func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int, opinion string, rectifiedInfo string) error {
+func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int, opinion string, content string, rectifiedTime string) error {
 	session := d.engine.NewSession()
 	session := d.engine.NewSession()
 	defer session.Close()
 	defer session.Close()
 	// add Begin() before any action
 	// add Begin() before any action
@@ -381,7 +381,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 		return err
 		return err
 	}
 	}
 	if auditor.AuditId != uid {
 	if auditor.AuditId != uid {
-		return errors.New("该用户没有审批权限!")
+		return errors.New("该用户没有审批权限")
 	}
 	}
 
 
 	var msgContent string
 	var msgContent string
@@ -452,7 +452,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 			return err
 			return err
 		}
 		}
 		// 增加审批日志
 		// 增加审批日志
-		auditReacord := &models.CmSafeAudit{BidsectionId: auditor.BidsectionId, SafeId: auditor.DataId, AuditId: auditor.AuditId, Times: safe.Times, CreateTime: time.Now(), Status: 0, Progress: auditor.Progress + 1, Opinion: opinion, Rectifiedinfo: rectifiedInfo}
+		auditReacord := &models.CmSafeAudit{BidsectionId: auditor.BidsectionId, SafeId: auditor.DataId, AuditId: auditor.AuditId, Times: safe.Times, CreateTime: time.Now(), Status: 0, Progress: auditor.Progress + 1, Opinion: opinion}
 		_, err = session.Insert(auditReacord)
 		_, err = session.Insert(auditReacord)
 		if err != nil {
 		if err != nil {
 			session.Rollback()
 			session.Rollback()
@@ -481,7 +481,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 			}
 			}
 
 
 			// 将cm_tree的safe_rectification待整改+1
 			// 将cm_tree的safe_rectification待整改+1
-			_, err := session.Exec("update cm_tree set safe_rectification_in = safe_rectification_in + 1, safe_rectification = if(safe_rectification >= 1, safe_rectification - 1, 0) where bidsection_id = ?", auditor.BidsectionId)
+			_, err = session.Exec("update cm_tree set safe_rectification_in = safe_rectification_in + 1, safe_rectification = if(safe_rectification >= 1, safe_rectification - 1, 0) where bidsection_id = ?", auditor.BidsectionId)
 			if err != nil {
 			if err != nil {
 				session.Rollback()
 				session.Rollback()
 				return err
 				return err
@@ -501,6 +501,23 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 					session.Rollback()
 					session.Rollback()
 					return err
 					return err
 				}
 				}
+
+				// 将整改单的状态->完成,并且填入整改日期
+				rectification := &models.CmRectification{}
+				rectification.BidsectionId = safe.BidsectionId
+				rectification.ProjectId = safe.ProjectId
+				rectification.DataId = safe.Id
+				rectification.DataType = 0
+				rectification.CreateTime = time.Now()
+				newRectifiedTime, _ := time.Parse("2006-01-02 15:04:05", rectifiedTime)
+				rectification.RectifiedTime = newRectifiedTime
+				rectification.Content = content
+				rectification.Status = 1
+				_, err = session.Insert(rectification)
+				if err != nil {
+					session.Rollback()
+					return err
+				}
 			} else {
 			} else {
 				// 复查流程
 				// 复查流程
 				// 查找最后一个审批人
 				// 查找最后一个审批人
@@ -573,7 +590,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 		}
 		}
 
 
 		// 增加审批日志
 		// 增加审批日志
-		auditReacord := &models.CmQualityAudit{BidsectionId: auditor.BidsectionId, QualityId: auditor.DataId, AuditId: auditor.AuditId, Times: quality.Times, CreateTime: time.Now(), Status: 0, Progress: auditor.Progress + 1, Opinion: opinion, Rectifiedinfo: rectifiedInfo}
+		auditReacord := &models.CmQualityAudit{BidsectionId: auditor.BidsectionId, QualityId: auditor.DataId, AuditId: auditor.AuditId, Times: quality.Times, CreateTime: time.Now(), Status: 0, Progress: auditor.Progress + 1, Opinion: opinion}
 		_, err = session.Insert(auditReacord)
 		_, err = session.Insert(auditReacord)
 		if err != nil {
 		if err != nil {
 			session.Rollback()
 			session.Rollback()
@@ -602,7 +619,7 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 			}
 			}
 
 
 			// 将cm_tree的quality_rectification待整改+1
 			// 将cm_tree的quality_rectification待整改+1
-			_, err := session.Exec("update cm_tree set quality_rectification_in = quality_rectification_in + 1, quality_rectification = if(quality_rectification >= 1, quality_rectification - 1, 0) where bidsection_id = ?", auditor.BidsectionId)
+			_, err = session.Exec("update cm_tree set quality_rectification_in = quality_rectification_in + 1, quality_rectification = if(quality_rectification >= 1, quality_rectification - 1, 0) where bidsection_id = ?", auditor.BidsectionId)
 			if err != nil {
 			if err != nil {
 				session.Rollback()
 				session.Rollback()
 				return err
 				return err
@@ -622,6 +639,24 @@ func (d *ApproverDao) PassHandler(auditType string, id int, uid int, auditId int
 					session.Rollback()
 					session.Rollback()
 					return err
 					return err
 				}
 				}
+
+				// 将整改单的状态->完成,并且填入整改日期
+				rectification := &models.CmRectification{}
+				rectification.BidsectionId = quality.BidsectionId
+				rectification.ProjectId = quality.ProjectId
+				rectification.DataId = quality.Id
+				rectification.DataType = 1
+				rectification.CreateTime = time.Now()
+				newRectifiedTime, _ := time.Parse("2006-01-02 15:04:05", rectifiedTime)
+				rectification.RectifiedTime = newRectifiedTime
+				rectification.Content = content
+				rectification.Status = 1
+				_, err = session.Insert(rectification)
+				if err != nil {
+					session.Rollback()
+					return err
+				}
+
 			} else {
 			} else {
 				// 复查流程
 				// 复查流程
 				// 查找最后一个审批人
 				// 查找最后一个审批人

+ 3 - 3
services/quality_audit.service.go

@@ -23,7 +23,7 @@ type QualityAuditService interface {
 	// AddAuditor(safeId int, bId int, auditId int, times int) error
 	// AddAuditor(safeId int, bId int, auditId int, times int) error
 	CloseAudit(id int, opinion string, curUid int, saveId int) error
 	CloseAudit(id int, opinion string, curUid int, saveId int) error
 	BackAudit(id int, opinion string, curUid int, saveId int, auditId int) error
 	BackAudit(id int, opinion string, curUid int, saveId int, auditId int) error
-	PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string) error
+	PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string, rectifiedTime string) error
 	StartAudit(safeId int, bidsectionId int, auditors []int, reAuditors []int, uid int, pid int, inspection string, inspectionDetail string, demand string, createTime time.Time) error
 	StartAudit(safeId int, bidsectionId int, auditors []int, reAuditors []int, uid int, pid int, inspection string, inspectionDetail string, demand string, createTime time.Time) error
 }
 }
 
 
@@ -77,8 +77,8 @@ func (s *qualityAuditService) BackAudit(id int, opinion string, curUid int, save
 }
 }
 
 
 // 审批通过
 // 审批通过
-func (s *qualityAuditService) PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string) error {
-	err := s.daoApprover.PassHandler("quality", id, uid, auditId, opinion, rectifiedInfo)
+func (s *qualityAuditService) PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string, rectifiedTime string) error {
+	err := s.daoApprover.PassHandler("quality", id, uid, auditId, opinion, rectifiedInfo, rectifiedTime)
 	return err
 	return err
 }
 }
 
 

+ 3 - 3
services/safe_audit.service.go

@@ -23,7 +23,7 @@ type SafeAuditService interface {
 	// AddAuditor(safeId int, bId int, auditId int, times int) error
 	// AddAuditor(safeId int, bId int, auditId int, times int) error
 	CloseAudit(id int, opinion string, curUid int, saveId int) error
 	CloseAudit(id int, opinion string, curUid int, saveId int) error
 	BackAudit(id int, opinion string, curUid int, saveId int, auditId int) error
 	BackAudit(id int, opinion string, curUid int, saveId int, auditId int) error
-	PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string) error
+	PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string, rectifiedTime string) error
 	StartAudit(safeId int, bidsectionId int, auditors []int, reAuditors []int, uid int, pid int, inspection string, inspectionDetail string, demand string, createTime time.Time) error
 	StartAudit(safeId int, bidsectionId int, auditors []int, reAuditors []int, uid int, pid int, inspection string, inspectionDetail string, demand string, createTime time.Time) error
 }
 }
 
 
@@ -79,8 +79,8 @@ func (s *safeAuditService) BackAudit(id int, opinion string, curUid int, saveId
 }
 }
 
 
 // 审批通过
 // 审批通过
-func (s *safeAuditService) PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string) error {
-	err := s.daoApprover.PassHandler("safe", id, uid, auditId, opinion, rectifiedInfo)
+func (s *safeAuditService) PassAudit(id int, uid int, auditId int, opinion string, rectifiedInfo string, rectifiedTime string) error {
+	err := s.daoApprover.PassHandler("safe", id, uid, auditId, opinion, rectifiedInfo, rectifiedTime)
 	return err
 	return err
 }
 }
 
 

+ 2 - 1
web/api/quality_audit_api.go

@@ -212,6 +212,7 @@ func (c *QualityAuditApi) PostBack() {
 // @Param   audit_id    body    string		false		"整改人id"
 // @Param   audit_id    body    string		false		"整改人id"
 // @Param 	opinion			body 		string		false		"审批意见"
 // @Param 	opinion			body 		string		false		"审批意见"
 // @Param   rectifiedInfo body string false "整改情况"
 // @Param   rectifiedInfo body string false "整改情况"
+// @Param		rectifiedTime body string false "整改日期"
 // @Success 200 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Success 200 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Failure 400 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Failure 400 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Router /api/quality_audit/pass [post]
 // @Router /api/quality_audit/pass [post]
@@ -244,7 +245,7 @@ func (c *QualityAuditApi) PostPass() {
 		return
 		return
 	}
 	}
 	// 4. 执行sql
 	// 4. 执行sql
-	err = c.QualityAuditService.PassAudit(id, uid, auditId, qualityAuditData.Opinion, qualityAuditData.RectifiedInfo)
+	err = c.QualityAuditService.PassAudit(id, uid, auditId, qualityAuditData.Opinion, qualityAuditData.RectifiedInfo, qualityAuditData.rectifiedTime)
 	if err != nil {
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 		return

+ 2 - 1
web/api/safe_audit_api.go

@@ -212,6 +212,7 @@ func (c *SafeAuditApi) PostBack() {
 // @Param   audit_id    body    string		false		"整改人id"
 // @Param   audit_id    body    string		false		"整改人id"
 // @Param 	opinion			body 		string		false		"审批意见"
 // @Param 	opinion			body 		string		false		"审批意见"
 // @Param   rectifiedInfo body string false "整改情况"
 // @Param   rectifiedInfo body string false "整改情况"
+// @Param   rectifiedTime body string false "整改日期"
 // @Success 200 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Success 200 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Failure 400 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Failure 400 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Router /api/safe_audit/pass [post]
 // @Router /api/safe_audit/pass [post]
@@ -244,7 +245,7 @@ func (c *SafeAuditApi) PostPass() {
 		return
 		return
 	}
 	}
 	// 4. 执行sql
 	// 4. 执行sql
-	err = c.SafeAuditService.PassAudit(id, uid, auditId, safeAuditData.Opinion, safeAuditData.RectifiedInfo)
+	err = c.SafeAuditService.PassAudit(id, uid, auditId, safeAuditData.Opinion, safeAuditData.RectifiedInfo, safeAuditData.RectifiedTime)
 	if err != nil {
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 		return

+ 1 - 0
web/viewmodels/quality_audit.go

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

+ 1 - 0
web/viewmodels/safe_audit.go

@@ -25,6 +25,7 @@ type SafeAudit struct {
 	Progress      string    `form:"progress" json:"progress"`
 	Progress      string    `form:"progress" json:"progress"`
 	Opinion       string    `form:"opinion" json:"opinion"`
 	Opinion       string    `form:"opinion" json:"opinion"`
 	RectifiedInfo string    `form:"rectifiedInfo" json:"rectifiedInfo"`
 	RectifiedInfo string    `form:"rectifiedInfo" json:"rectifiedInfo"`
+	RectifiedTime string    `form:"rectifiedTime" json:"rectifiedTime"`
 }
 }
 
 
 type HistorySafeAudit struct {
 type HistorySafeAudit struct {