后端: 日常评价专业处室分办环节可退回

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -967,6 +967,7 @@ func (this *OilContractReviewController) CommonAuditEntity() {
 // @router /business-separate-audit/:id [post]
 func (this *OilContractReviewController) BusinessOfficeSeparateAuditEntity() {
 	Id := this.Ctx.Input.Param(":id")
+	Result := this.GetString("Result")
 	ProfessionalAudit := this.GetString("ProfessionalAudit")
 	AuditRemark := this.GetString("AuditRemark")
 
@@ -986,11 +987,8 @@ func (this *OilContractReviewController) BusinessOfficeSeparateAuditEntity() {
 		}
 	}()
 
-	if ProfessionalAudit == "" {
-		errInfo.Message = "请选择审批人"
-		errInfo.Code = -1
-		this.Data["json"] = &errInfo
-		this.ServeJSON()
+	if Result == "1" && ProfessionalAudit == "" {
+		panic("请选择审批人")
 	}
 	if Id != "" {
 		Ids := strings.Split(Id, ",")
@@ -1017,16 +1015,18 @@ func (this *OilContractReviewController) BusinessOfficeSeparateAuditEntity() {
 				if receiveVal != "true" {
 					log.Print("日常评价 工作流异常，业务ID：" + contractReviewEntity.BusinessKey + "，工作流信息：" + receiveVal)
 				} else {
-					cols := []string{
-						"Id",
-						"Status",
-						"ProfessionalAudit",
+					if Result == "1" {
+						cols := []string{
+							"Id",
+							"Status",
+							"ProfessionalAudit",
+						}
+						supplierCertId := strings.Split(contractReviewEntity.BusinessKey, "-")[0]
+						contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
+						contractReviewEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
+						conRev.UpdateEntityByIdCols(supplierCertId, contractReviewEntity, cols)
+						fmt.Println("业务处室分办协程！" + strconv.Itoa(i))
 					}
-					supplierCertId := strings.Split(contractReviewEntity.BusinessKey, "-")[0]
-					contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
-					contractReviewEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
-					conRev.UpdateEntityByIdCols(supplierCertId, contractReviewEntity, cols)
-					fmt.Println("业务处室分办协程！" + strconv.Itoa(i))
 				}
 			}()
 			lock.Unlock()