Browse Source

任务分配负责人设置

huahaiyan 6 năm trước cách đây
mục cha
commit
3e78908b76

+ 2 - 0
src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -69,6 +69,8 @@ const (
 	REPORTISSUE string = "REPORTISSUE"
 	// 报告审核
 	REPORTAUDIT string = "REPORTAUDIT"
+	// 任务分配负责人
+	ENTRUSTBALANCE string = "ENTRUSTBALANCE"
 )
 
 type TableDetailData struct {

+ 15 - 11
src/dashoo.cn/backend/api/controllers/lims/limsbalance.go

@@ -1,7 +1,9 @@
 package lims
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/limsdataentry"
+	"dashoo.cn/backend/api/business/workflow"
 	"encoding/json"
 
 	//"fmt"
@@ -185,18 +187,20 @@ func (this *LimsBalanceController) GetUserList() {
 		}
 		userIds = strings.Trim(userIds, ",")
 		where = where + " and Id in (" + userIds + ")"
+	} else {
+		var users []userRole.Base_RoleList
+		var userIds string
+		var RoleSet auditsetting.Base_OilAuditSetting
+		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.ENTRUSTBALANCE, &RoleSet)
+		usersvc := limsdataentry.GetLimsDataEntryService(utils.DBE)
+		users = usersvc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
+		for _, tmpUser := range users {
+			userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		}
+		userIds = strings.Trim(userIds, ",")
+		where = where + " and Id in (" + userIds + ")"
 	}
-	//else {
-	//	svcuser := limsdataentry.GetLimsDataEntryService(utils.DBE)
-	//	var userrolelist []userRole.Base_RoleList
-	//	userrolelist = svcuser.GetUserByRole("10000180", this.User.AccCode)
-	//	var userIds string
-	//	for _, tmpUser := range userrolelist {
-	//		userIds += strconv.FormatInt(tmpUser.Id,10) + ","
-	//	}
-	//	userIds = strings.Trim(userIds, ",")
-	//	where = where + " and Id in (" + userIds + ")"
-	//}
 	total := svc.GetPagingEntitiesWithOrder(page.CurrentPage, page.Size, "Id", false, &users, where)
 	var datainfo DataInfo
 	datainfo.Items = users