Merge branch 'feature/gn_2.1'

controllers/report_open.go

@@ -291,25 +291,22 @@ func (this *ReportOpenController) ReportApprove() {
 	for _, v := range req.ReportIds {
 		reportExist, pptExist := services.GetReportByOutReportId(v)
 		if reportExist == nil && pptExist == nil {
-			br.Msg = fmt.Sprintf("报告ID: %d不存在", v)
-			br.ErrMsg = fmt.Sprintf("报告ID: %d不存在", v)
-			return
+			utils.FileLog.Info(fmt.Sprintf("ReportApprove-报告ID: %d不存在", v))
+			continue
 		}
 
 		// 通过和驳回需要审批中状态，撤回暂不做限制
 		if reportExist != nil && reportExist.Id > 0 {
-			if (req.ApproveType == 1 || req.ApproveType == 2) && reportExist.State != models.ReportStateWaitApprove {
-				br.Msg = "报告当前状态不允许审批"
-				br.ErrMsg = fmt.Sprintf("报告当前状态不允许审批, %d", reportExist.State)
-				return
+			if req.ApproveType != 3 && reportExist.State != models.ReportStateWaitApprove && reportExist.State != models.ReportStateRefused {
+				utils.FileLog.Info(fmt.Sprintf("ReportApprove-报告当前状态不允许审批, OutId: %d, State: %d", v, reportExist.State))
+				continue
 			}
 			updateReports = append(updateReports, reportExist)
 		}
 		if pptExist != nil && pptExist.PptId > 0 {
-			if (req.ApproveType == 1 || req.ApproveType == 2) && pptExist.State != models.ReportStateWaitApprove {
-				br.Msg = "报告当前状态不允许审批"
-				br.ErrMsg = fmt.Sprintf("报告当前状态不允许审批, %d", reportExist.State)
-				return
+			if req.ApproveType != 3 && pptExist.State != models.ReportStateWaitApprove && pptExist.State != models.ReportStateRefused {
+				utils.FileLog.Info(fmt.Sprintf("ReportApprove-PPT当前状态不允许审批, OutId: %d, State: %d", v, pptExist.State))
+				continue
 			}
 			updatePpts = append(updatePpts, pptExist)
 		}
@@ -540,7 +537,7 @@ func (this *ReportOpenController) ReportRemove() {
 		return
 	}
 
-	// TODO:若报告的状态是已审批状态，那么把OutReportId置空，不做物理删除
+	// TODO:(可选优化)若报告的状态是已审批状态，那么把OutReportId置空，不做物理删除
 	for _, v := range req.ReportIds {
 		reportExist, pptExist := services.GetReportByOutReportId(v)
 		// 不存在忽略即可