2
3
Prechádzať zdrojové kódy

后端: 获取当前登录人有哪些环节上的一键审批权限;评价-业务处室分办可批量

baichengfei 4 rokov pred
rodič
commit
f4ee8bea92

+ 26 - 0
src/dashoo.cn/backend/api/controllers/casbin/permission.go

@@ -247,3 +247,29 @@ func (this *PermissionController) GetDelAuditForProf() {
 	this.Data["json"] = res
 	this.ServeJSON()
 }
+
+// @Title get
+// @Description get user by token
+// @Param	uid		path 	string	true		"The key for staticblock"
+// @Success 200 {object} models.User
+// @Failure 403 :uid is empty
+// @router /batch-audit [get]
+func (this *PermissionController) GetBatchAuditPermission() {
+
+	svc := permission.GetPermissionService(utils.DBE)
+	first := svc.IsAuthorized(this.User.Id, "oil_contract.Review.Batch.First")
+	second := svc.IsAuthorized(this.User.Id, "oil_contract.Review.Batch.second")
+	busSep := svc.IsAuthorized(this.User.Id, "oil_contract.Review.Batch.busSep")
+	busAudit := svc.IsAuthorized(this.User.Id, "oil_contract.Review.Batch.busAudit")
+	profReg := svc.IsAuthorized(this.User.Id, "oil_contract.Review.Batch.profReg")
+
+	var res [5]bool
+	res[0] = first
+	res[1] = second
+	res[2] = busSep
+	res[3] = busAudit
+	res[4] = profReg
+
+	this.Data["json"] = res
+	this.ServeJSON()
+}

+ 31 - 30
src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -90,11 +90,7 @@ func (this *OilContractReviewController) GetEntityList() {
 	}
 
 	if Status != "" {
-		if Status == "8" || Status == "0" {
-			where = where + " and r.Status=" + Status
-		} else {
-			where = where + " and r.Status > 0 and r.Status !=8"
-		}
+		where = where + " and r.Status=" + Status
 	}
 
 	if CreateOn != "" {
@@ -874,31 +870,36 @@ func (this *OilContractReviewController) BusinessOfficeSeparateAuditEntity() {
 		}
 	}()
 
-	//取出日常评审主表信息
-	conRev := contractReview.GetOilContractReviewService(utils.DBE)
-	var contractReviewEntity contractReview.OilContractReview
-	conRev.GetEntityById(Id, &contractReviewEntity)
+	if Id != "" {
+		Ids := strings.Split(Id, ",")
+		for i := 0; i < len(Ids); i++ {
+			//取出日常评审主表信息
+			conRev := contractReview.GetOilContractReviewService(utils.DBE)
+			var contractReviewEntity contractReview.OilContractReview
+			conRev.GetEntityById(Ids[i], &contractReviewEntity)
 
-	svcActiviti := workflow.GetActivitiService(utils.DBE)
-	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
-	ActiComplete.BusinessKey = contractReviewEntity.BusinessKey
-	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = "1"          //前台审批[同意、不同意]
-	ActiComplete.UserNames = ProfessionalAudit
-	ActiComplete.Remarks = AuditRemark
-	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
-	receiveVal := svcActiviti.TaskComplete(ActiComplete)
-	if receiveVal != "true" {
-		panic("工作流异常,请联系管理员!" + receiveVal)
-	}
-	cols := []string{
-		"Id",
-		"Status",
-		"ProfessionalAudit",
+			svcActiviti := workflow.GetActivitiService(utils.DBE)
+			var ActiComplete workflow.ActiCompleteVM
+			ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
+			ActiComplete.BusinessKey = contractReviewEntity.BusinessKey
+			ActiComplete.UserId = this.User.Id //审批人员
+			ActiComplete.Result = "1"          //前台审批[同意、不同意]
+			ActiComplete.UserNames = ProfessionalAudit
+			ActiComplete.Remarks = AuditRemark
+			ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
+			receiveVal := svcActiviti.TaskComplete(ActiComplete)
+			if receiveVal != "true" {
+				panic("工作流异常,请联系管理员!" + receiveVal)
+			}
+			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)
+		}
 	}
-	supplierCertId := strings.Split(contractReviewEntity.BusinessKey, "-")[0]
-	contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
-	contractReviewEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
-	conRev.UpdateEntityByIdCols(supplierCertId, contractReviewEntity, cols)
 }