工作流设置

src/dashoo.cn/backend/api/business/auditsetting/oilauditsetting.go

@@ -12,6 +12,8 @@ type Base_OilAuditSetting struct {
 	AuditStepName  string    `xorm:"comment('审批步骤名称') VARCHAR(50)"`
 	RoleId         int       `xorm:"not null default 0 comment('角色ID') INT(10)"`
 	RoleName       string    `xorm:"comment('角色名称') VARCHAR(50)"`
+	WorkFlowCord   string    `xorm:"comment('工作流编码') VARCHAR(50)"`
+	WorkFlowName   string    `xorm:"comment('工作流名称') VARCHAR(50)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	CreateOn       time.Time `xorm:"DATETIME"`

src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -1,6 +1,7 @@
 package limsbalance
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/codecsequence"
 	"dashoo.cn/backend/api/business/limsdataentry"
 	"dashoo.cn/backend/api/business/limsdoctemplate"
@@ -83,7 +84,7 @@ func (s *LimsBalanceService) GetBalanceInfoWithCustomor(balance string, entrust
 	return
 }
 
-func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string, LimsTaskBalanceName string, LimsDocTemplateName string,
+func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string,DeptID string, LimsTaskBalanceName string, LimsDocTemplateName string,
 													LimsDocTemplateDetailName string, LimsDateEntryName string,LimsEntrustMainName string, balanceid int,departartmentId string,Eid string) error {
 	var err error
 	//获取TemplateCode
@@ -246,16 +247,11 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 		//启动数据录入工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var processInstanceId string
-		switch departartmentId {
-		case "100000150":
-			processInstanceId = svcActiviti.StartProcess(workflow.TJZ_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
-		case "100000151":
-			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
-		case "100000168":
-			processInstanceId = svcActiviti.StartProcess(workflow.JL_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
-		case "100000169":
-			processInstanceId = svcActiviti.StartProcess(workflow.JN_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
-		}
+		var RoleSet auditsetting.Base_OilAuditSetting
+		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+		rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting",DeptID,workflow.DATAAUDIT, &RoleSet)
+		processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
+
 		dataentryentity.DocKey=processInstanceId
 		err = this.UpdateEntityBytbl(AccCode+LimsDateEntryName, dataentryentity.Id, &dataentryentity, []string{"DocKey"})
 	}

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -32,8 +32,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s := new(ActivitiService)
 	s.DBE = xormEngine
 	//s.BaseUrl = "http://123.56.168.26:8080/activiti-rest/service"
-	s.BaseUrl = "http://192.168.0.166:8081/api/acti"
-	//s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
+	//s.BaseUrl = "http://192.168.0.166:8081/api/acti"
+	s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
 	//s.BaseUrl = "http://localhost:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
 	//s.OriginUrl = "http://192.168.0.166:8081/api"

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -59,10 +59,14 @@ const (
 	JL_DATA_KEY string = "jl_data_apply"
 	// 节能
 	JN_DATA_KEY string = "jn_data_apply"
-	// 节能校核
-	JN_JIAOHE string = "JN_JIAOHE"
-	// 节能审批
-	JN_SHENPI string = "JN_REPORTAUDIT"
+	// 数据录入校核
+	DATAJIAOHE string = "DATAJIAOHE"
+	// 数据录入审批
+	DATAAUDIT string = "DATAAUDIT"
+	// 报告签发
+	REPORTISSUE string = "REPORTISSUE"
+	// 报告审核
+	REPORTAUDIT string = "REPORTAUDIT"
 )
 
 type TableDetailData struct {

src/dashoo.cn/backend/api/controllers/lims/auditsetting.go

@@ -43,6 +43,8 @@ func (this *OilAuditSettingController) GetEntityList() {
 	AuditStepName := this.GetString("AuditStepName")
 	RoleId := this.GetString("RoleId")
 	RoleName := this.GetString("RoleName")
+	WorkFlowCord := this.GetString("WorkFlowCord")
+	WorkFlowName := this.GetString("WorkFlowName")
 	Remark := this.GetString("Remark")
 	CreateOn := this.GetString("CreateOn")
 
@@ -77,6 +79,13 @@ func (this *OilAuditSettingController) GetEntityList() {
 		where = where + " and RoleName like '%" + RoleName + "%'"
 	}
 
+	if WorkFlowCord != "" {
+		where = where + " and WorkFlowCord like '%" + WorkFlowCord + "%'"
+	}
+
+	if WorkFlowName != "" {
+		where = where + " and WorkFlowName like '%" + WorkFlowName + "%'"
+	}
 
 	if Remark != "" {
 		where = where + " and Remark like '%" + Remark + "%'"
@@ -113,6 +122,7 @@ func (this *OilAuditSettingController) GetDictList() {
 	dictSvc := items.GetItemsService(utils.DBE)
 	userSvc := baseUser.GetBaseUserService(utils.DBE)
 	dictList["AuditStep"] = dictSvc.GetKeyValueItems("AuditStep", this.User.AccCode)
+	dictList["WorkFlow"] = dictSvc.GetKeyValueItems("WorkFlow", this.User.AccCode)
 	var userEntity userRole.Base_User
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
@@ -214,36 +224,22 @@ func (this *OilAuditSettingController) UpdateEntity() {
 	cols := []string{
 
 		"Id",
-
 		"OrganizeId",
-
 		"OrganizeName",
-
 		"AuditStepCode",
-
 		"AuditStepName",
-
 		"RoleId",
-
 		"RoleName",
-
+		"WorkFlowCord",
+		"WorkFlowName",
 		"Remark",
-
 		"IsDelete",
-
 		"CreateOn",
-
 		"CreateUserId",
-
 		"CreateBy",
-
 		"ModifiedOn",
-
 		"ModifiedUserId",
-
 		"ModifiedBy",
-
-
 	}
 	err := svc.UpdateEntityBytbl(OilAuditSettingName, id, &model, cols)
 	if err == nil {

src/dashoo.cn/backend/api/controllers/lims/limsbalance.go

@@ -274,7 +274,7 @@ func (this *LimsBalanceController) EditDetail() {
 	opdesc := "编辑任务分配-" + strconv.Itoa(model.Id)
 	var cols []string = []string{"BalanceId", "BalanceBy", "SampleCode", "BarCode", "BalanceTime", "BalanceStatus", "ConUserId", "ConUserBy", "Remark", "ModifiedBy", "ModifiedUserId"}
 	err := svc.UpdateOperationAndWriteLogBytbl(this.User.AccCode+LimsTaskBalanceName, BaseOperationLogName, id, &model, &entity, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "任务分配")
-	err = svc.CreateDataentry(this.User.AccCode, this.User.Id, LimsTaskBalanceName, LimsDocTemplateName, LimsDocTemplateDetailName, LimsDateEntryName, LimsEntrustMainName, entity.Id, this.User.DepartmentId, id)
+	err = svc.CreateDataentry(this.User.AccCode, this.User.Id,this.User.DepartmentId, LimsTaskBalanceName, LimsDocTemplateName, LimsDocTemplateDetailName, LimsDateEntryName, LimsEntrustMainName, entity.Id, this.User.DepartmentId, id)
 	if err == nil {
 		errinfo.Message = "操作成功！"
 		errinfo.Code = 0

src/dashoo.cn/backend/api/controllers/lims/limscreatereport.go

@@ -1,6 +1,7 @@
 package lims
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/limscreatereport"
 	"encoding/base64"
 	"encoding/json"
@@ -1541,63 +1542,35 @@ func (this *CreateReportController) ShenHeReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			users = svc.GetUserByRole("10000185", this.User.AccCode)
-			var userIds string
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_PROCESS_KEY, strconv.Itoa(dataother.ReportId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
-				if err == nil {
-					errinfo.Message = "通过审核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
+		var RoleSet auditsetting.Base_OilAuditSetting
+		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
+		users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
+		var userIds string
+		for _, tmpUser := range users {
+			userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		}
+		userIds = strings.Trim(userIds, ",")
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.ReportId), userIds, this.User.Id, "1", dataother.AuditorRemark)
+		if receiveVal == "true" {
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
+			if err == nil {
+				errinfo.Message = "通过审核！"
+				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
-			}
-		case "100000151":
-			users = svc.GetUserByRole("10000186", this.User.AccCode)
-			var userIds string
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_PROCESS_KEY, strconv.Itoa(dataother.ReportId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
-				if err == nil {
-					errinfo.Message = "通过审核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
 			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Message = "审核错误！"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
 			}
+		} else {
+			errinfo.Message = "工作流异常，请联系管理员！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
 	} else {
 		var errinfo ErrorInfo
@@ -1615,61 +1588,35 @@ func (this *CreateReportController) ShenHeReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			for j:=0;j<len(reportlistall);j++{
-				receiveVal = svcActiviti.TaskComplete(workflow.TJZ_PROCESS_KEY, strconv.Itoa(reportlistall[j].Id), strconv.Itoa(reportlistall[j].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-				if receiveVal == "true" {
-					for i:=0;i<len(reportlistall);i++{
-						err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, reportlistall[i].Id, entityempty, cols)
-						if err == nil {
-							errinfo.Message = "未通过审核！"
-							errinfo.Code = 0
-							this.Data["json"] = &errinfo
-							this.ServeJSON()
-						} else {
-							errinfo.Message = "审核错误！"
-							errinfo.Code = -1
-							this.Data["json"] = &errinfo
-							this.ServeJSON()
-						}
-					}
-				} else {
-					errinfo.Message = "工作流异常，请联系管理员！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-					return
-				}
-			}
-		case "100000151":
-			for j:=0;j<len(reportlistall);j++ {
-				receiveVal = svcActiviti.TaskComplete(workflow.YX_PROCESS_KEY, strconv.Itoa(reportlistall[j].Id), strconv.Itoa(reportlistall[j].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-				if receiveVal == "true" {
-					for i := 0; i < len(reportlistall); i++ {
-						err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, reportlistall[i].Id, entityempty, cols)
-						if err == nil {
-							errinfo.Message = "未通过审核！"
-							errinfo.Code = 0
-							this.Data["json"] = &errinfo
-							this.ServeJSON()
-						} else {
-							errinfo.Message = "审核错误！"
-							errinfo.Code = -1
-							this.Data["json"] = &errinfo
-							this.ServeJSON()
-						}
+		var RoleSet auditsetting.Base_OilAuditSetting
+		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
+		for j:=0;j<len(reportlistall);j++{
+			receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(reportlistall[j].Id), strconv.Itoa(reportlistall[j].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+			if receiveVal == "true" {
+				for i:=0;i<len(reportlistall);i++{
+					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, reportlistall[i].Id, entityempty, cols)
+					if err == nil {
+						errinfo.Message = "未通过审核！"
+						errinfo.Code = 0
+						this.Data["json"] = &errinfo
+						this.ServeJSON()
+					} else {
+						errinfo.Message = "审核错误！"
+						errinfo.Code = -1
+						this.Data["json"] = &errinfo
+						this.ServeJSON()
 					}
-				} else {
-					errinfo.Message = "工作流异常，请联系管理员！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-					return
 				}
+			} else {
+				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
 			}
 		}
-		//未通过审核重新生成数据录入工作流改变数据录入状态
+
 		var balanceentity limsbalance.LimsTaskBalance
 		var dataentryentity []limsdataentry.LimsDateEntry
 		var balanceentityempty limsbalance.LimsTaskBalance
@@ -1687,12 +1634,8 @@ func (this *CreateReportController) ShenHeReport() {
 			//启动数据录入工作流
 			svcActiviti := workflow.GetActivitiService(utils.DBE)
 			var processInstanceId string
-			switch this.User.DepartmentId {
-			case "100000150":
-				processInstanceId=svcActiviti.StartProcess(workflow.TJZ_DATA_KEY, strconv.Itoa(dataentryentity[i].Id), strconv.Itoa(dataentryentity[i].CheckUserId))
-			case "100000151":
-				processInstanceId=svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity[i].Id), strconv.Itoa(dataentryentity[i].CheckUserId))
-			}
+			processInstanceId=svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity[i].Id), strconv.Itoa(dataentryentity[i].CheckUserId))
+
 			dataentryentityempty.DocKey=processInstanceId
 			svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, dataentryentity[i].Id, dataentryentityempty, dataentrycols)
 		}
@@ -1709,6 +1652,9 @@ func (this *CreateReportController) QianfaReport() {
 	var dataother ShenHeModel
 	json.Unmarshal(jsonblob, &dataother)
 	var list []limscreatereport.LimsCreateReport
+	var RoleSet auditsetting.Base_OilAuditSetting
+	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 3 {
 		where := " Id = '" + strconv.Itoa(dataother.ReportId) + "'"
@@ -1724,52 +1670,28 @@ func (this *CreateReportController) QianfaReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_PROCESS_KEY, strconv.Itoa(dataother.ReportId), "", this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
-				if err == nil {
-					errinfo.Message = "签发成功！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "签发错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.ReportId), "", this.User.Id, "1", dataother.AuditorRemark)
+		if receiveVal == "true" {
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
+			if err == nil {
+				errinfo.Message = "签发成功！"
+				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
-			}
-		case "100000151":
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_PROCESS_KEY, strconv.Itoa(dataother.ReportId), "", this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
-				if err == nil {
-					errinfo.Message = "签发成功！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "签发错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
 			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Message = "签发错误！"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
 			}
+		} else {
+			errinfo.Message = "工作流异常，请联系管理员！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
+
 	} else {
 		where := " Id = '" + strconv.Itoa(dataother.ReportId) + "'"
 		svc.GetEntitysByWhere(this.User.AccCode+LimsCreateReportName, where, &list)
@@ -1784,51 +1706,26 @@ func (this *CreateReportController) QianfaReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_PROCESS_KEY, strconv.Itoa(dataother.ReportId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
-				if err == nil {
-					errinfo.Message = "签发未通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "签发错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.ReportId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+		if receiveVal == "true" {
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
+			if err == nil {
+				errinfo.Message = "签发未通过！"
+				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
-			}
-		case "100000151":
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_PROCESS_KEY, strconv.Itoa(dataother.ReportId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsCreateReportName, list[0].Id, entityempty, cols)
-				if err == nil {
-					errinfo.Message = "签发未通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "签发错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
 			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Message = "签发错误！"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
 			}
+		} else {
+			errinfo.Message = "工作流异常，请联系管理员！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
 	}
 }
@@ -1917,36 +1814,23 @@ func (this *CreateReportController) DelReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_PROCESS_KEY, Id, "", this.User.Id, "0", "特检删除报告")
-			if receiveVal == "true" {
-				errinfo.Message = "删除成功"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		case "100000151":
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_PROCESS_KEY, Id, "", this.User.Id, "0", "宇信报告删除")
-			if receiveVal == "true" {
-				errinfo.Message = "删除成功"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
+		var RoleSet auditsetting.Base_OilAuditSetting
+		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, Id, "", this.User.Id, "0", "特检删除报告")
+		if receiveVal == "true" {
+			errinfo.Message = "删除成功"
+			errinfo.Code = 0
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
+			errinfo.Message = "工作流异常，请联系管理员！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
+		
 	} else {
 		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
 		errinfo.Code = -1

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -156,16 +156,20 @@ func (this *LimsDataEntryController) GetToDoList() {
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	switch this.User.DepartmentId {
-	case "100000150":
-		processInstanceId = svcActiviti.GetMyTasks(workflow.TJZ_DATA_KEY, this.User.Id)
-	case "100000151":
-		processInstanceId = svcActiviti.GetMyTasks(workflow.YX_DATA_KEY, this.User.Id)
-	case "100000168":
-		processInstanceId = svcActiviti.GetMyTasks(workflow.JL_DATA_KEY, this.User.Id)
-	case "100000169":
-		processInstanceId = svcActiviti.GetMyTasks(workflow.JN_DATA_KEY, this.User.Id)
-	}
+	var RoleSet auditsetting.Base_OilAuditSetting
+	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
+	processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
+	//switch this.User.DepartmentId {
+	//case "100000150":
+	//	processInstanceId = svcActiviti.GetMyTasks(workflow.TJZ_DATA_KEY, this.User.Id)
+	//case "100000151":
+	//	processInstanceId = svcActiviti.GetMyTasks(workflow.YX_DATA_KEY, this.User.Id)
+	//case "100000168":
+	//	processInstanceId = svcActiviti.GetMyTasks(workflow.JL_DATA_KEY, this.User.Id)
+	//case "100000169":
+	//	processInstanceId = svcActiviti.GetMyTasks(workflow.JN_DATA_KEY, this.User.Id)
+	//}
 	EntrustNo := this.GetString("EntrustNo")
 	testDetailId := this.GetString("TestDetailId")
 	department := this.GetString("department")
@@ -2601,22 +2605,9 @@ func (this *LimsDataEntryController) GetUserListByJHRole() {
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	var users []userRole.Base_RoleList
 	var RoleSet auditsetting.Base_OilAuditSetting
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAJIAOHE, &RoleSet)
+	users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
 	//var errinfo ErrorInfo
-	switch this.User.DepartmentId {
-	case "100000150":
-		users = svc.GetUserByRole("10000177", this.User.AccCode)
-	case "100000151":
-		users = svc.GetUserByRole("10000181", this.User.AccCode)
-	//case "100000169":
-	//	users = svc.GetUserByRole("10000195", this.User.AccCode)
-	case "100000168":
-		users = svc.GetUserByRole("10000209", this.User.AccCode)
-	default:
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.JN_JIAOHE, &RoleSet)
-		users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
-	}
-
-
 
 	this.Data["json"] = users
 	this.ServeJSON()
@@ -2639,21 +2630,16 @@ func (this *LimsDataEntryController) CheckSubmit() {
 	var userIds string
 	var dataentrymodel limsdataentry.LimsDateEntry
 	svc.GetEntityByWhere(this.User.AccCode+LimsDateEntryName, "Id = '"+utils.ToStr(dataother.DataEntryId)+"'", &dataentrymodel)
+	var RoleSet auditsetting.Base_OilAuditSetting
+	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAJIAOHE, &RoleSet)
 	if dataentrymodel.DocKey == "" {
 		var dataentryentity limsdataentry.LimsDateEntry
 		//启动数据录入工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var processInstanceId string
-		switch this.User.DepartmentId {
-		case "100000150":
-			processInstanceId = svcActiviti.StartProcess(workflow.TJZ_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
-		case "100000151":
-			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
-		case "100000168":
-			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
-		case "100000169":
-			processInstanceId = svcActiviti.StartProcess(workflow.JN_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
-		}
+		processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
+
 		if processInstanceId == "" {
 			errinfo.Message = "工作流异常，请联系管理员！"
 			errinfo.Code = -1
@@ -2686,122 +2672,35 @@ func (this *LimsDataEntryController) CheckSubmit() {
 			//提交校核工作流
 			svcActiviti := workflow.GetActivitiService(utils.DBE)
 			var receiveVal string
-			switch this.User.DepartmentId {
-			case "100000150":
-				users = svc.GetUserByRole("10000178", this.User.AccCode)
-				for _, tmpUser := range users {
-					userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-				}
-				userIds = strings.Trim(userIds, ",")
-				receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-				if receiveVal == "true" {
-					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-					err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-					if err == nil {
-						errinfo.Message = "校核提交成功！"
-						errinfo.Code = 0
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					} else {
-						errinfo.Message = "校核提交发生错误,请检查后重新提交！"
-						errinfo.Code = -1
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					}
-				} else {
-					errinfo.Message = "工作流异常，请联系管理员！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-					return
-				}
-			case "100000151":
-				users = svc.GetUserByRole("10000183", this.User.AccCode)
-				for _, tmpUser := range users {
-					userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-				}
-				userIds = strings.Trim(userIds, ",")
-				receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-				if receiveVal == "true" {
-					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-					err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-					if err == nil {
-						errinfo.Message = "校核提交成功！"
-						errinfo.Code = 0
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					} else {
-						errinfo.Message = "校核提交发生错误,请检查后重新提交！"
-						errinfo.Code = -1
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					}
-				} else {
-					errinfo.Message = "工作流异常，请联系管理员！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-					return
-				}
-			case "100000168":
-				users = svc.GetUserByRole("10000210", this.User.AccCode)
-				for _, tmpUser := range users {
-					userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-				}
-				userIds = strings.Trim(userIds, ",")
-				receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-				if receiveVal == "true" {
-					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-					err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-					if err == nil {
-						errinfo.Message = "校核提交成功！"
-						errinfo.Code = 0
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					} else {
-						errinfo.Message = "校核提交发生错误,请检查后重新提交！"
-						errinfo.Code = -1
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					}
-				} else {
-					errinfo.Message = "工作流异常，请联系管理员！"
-					errinfo.Code = -1
+			var auditWorkflow auditsetting.Base_OilAuditSetting
+			rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+			rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &auditWorkflow)
+			users = svc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
+			for _, tmpUser := range users {
+				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+			}
+			userIds = strings.Trim(userIds, ",")
+			receiveVal = svcActiviti.TaskComplete(auditWorkflow.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
+			if receiveVal == "true" {
+				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+				if err == nil {
+					errinfo.Message = "校核提交成功！"
+					errinfo.Code = 0
 					this.Data["json"] = &errinfo
 					this.ServeJSON()
-					return
-				}
-			case "100000169":
-				var RoleSet auditsetting.Base_OilAuditSetting
-				rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-				rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.JN_SHENPI, &RoleSet)
-				users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode) //
-				for _, tmpUser := range users {
-					userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-				}
-				userIds = strings.Trim(userIds, ",")
-				receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-				if receiveVal == "true" {
-					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-					err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-					if err == nil {
-						errinfo.Message = "校核提交成功！"
-						errinfo.Code = 0
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					} else {
-						errinfo.Message = "校核提交发生错误,请检查后重新提交！"
-						errinfo.Code = -1
-						this.Data["json"] = &errinfo
-						this.ServeJSON()
-					}
 				} else {
-					errinfo.Message = "工作流异常，请联系管理员！"
+					errinfo.Message = "校核提交发生错误,请检查后重新提交！"
 					errinfo.Code = -1
 					this.Data["json"] = &errinfo
 					this.ServeJSON()
-					return
 				}
+			} else {
+				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
 			}
 
 		} else {
@@ -2824,16 +2723,8 @@ func (this *LimsDataEntryController) CheckSubmit() {
 				//提交校核工作流
 				svcActiviti := workflow.GetActivitiService(utils.DBE)
 				var receiveVal string
-				switch this.User.DepartmentId {
-				case "100000150":
-					receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
-				case "100000151":
-					receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
-				case "100000168":
-					receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
-				case "100000169":
-					receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
-				}
+				receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
+
 				fmt.Println(receiveVal)
 				var errinfo ErrorInfo
 				if err == nil {
@@ -2872,7 +2763,9 @@ func (this *LimsDataEntryController) JiaoHe() {
 	currentTime := time.Now().Format("060102150405") //当前时间
 	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.DATAAUDIT, &RoleSet)
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 2 {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
@@ -2892,126 +2785,34 @@ func (this *LimsDataEntryController) JiaoHe() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			users = svc.GetUserByRole("10000178", this.User.AccCode) //特检站审核人
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "校核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		case "100000151":
-			users = svc.GetUserByRole("10000183", this.User.AccCode) //宇信审核人
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "校核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		case "100000168":
-			//var RoleSet auditsetting.Base_OilAuditSetting
-			//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-			//rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,"报告审批", &RoleSet)
-			users = svc.GetUserByRole("10000183", this.User.AccCode) //宇信审核人
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
-			receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "校核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
+		users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
+		for _, tmpUser := range users {
+			userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+		}
+		userIds = strings.Trim(userIds, ",")
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
+		if receiveVal == "true" {
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+			err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+			if err == nil {
+				errinfo.Message = "校核通过！"
+				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
-			}
-		case "100000169":
-			var RoleSet auditsetting.Base_OilAuditSetting
-			rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-			rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.JN_SHENPI, &RoleSet)
-			users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
-			for _, tmpUser := range users {
-				userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
-			receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "校核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
 			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Message = "校核发生错误！"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
 			}
+		} else {
+			errinfo.Message = "工作流异常，请联系管理员！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
+
 	} else {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
 		svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, where, &list)
@@ -3030,76 +2831,23 @@ func (this *LimsDataEntryController) JiaoHe() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过校核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			}
-		case "100000151":
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过校核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			}
-		case "100000168":
-			receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过校核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			}
-		case "100000169":
-			receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过校核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "校核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+		if receiveVal == "true" {
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+			err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+			if err == nil {
+				errinfo.Message = "未通过校核！"
+				errinfo.Code = 0
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+			} else {
+				errinfo.Message = "校核发生错误！"
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
 			}
 		}
+
 	}
 }
 
@@ -3114,6 +2862,9 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 	json.Unmarshal(jsonblob, &dataother)
 	var list []limsdataentry.LimsDateEntry
 	currentTime := time.Now().Format("060102150405") //当前时间
+	var RoleSet auditsetting.Base_OilAuditSetting
+	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 4 {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
@@ -3133,100 +2884,122 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "审核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		case "100000151":
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "审核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		case "100000168":
-			receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "审核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
+		if receiveVal == "true" {
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+			err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+			if err == nil {
+				errinfo.Message = "审核通过！"
+				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
-			}
-		case "100000169":
-			receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "审核通过！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核发生错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
 			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Message = "审核发生错误！"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
 			}
+		} else {
+			errinfo.Message = "工作流异常，请联系管理员！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
+		//switch this.User.DepartmentId {
+		//case "100000150":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "审核通过！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核发生错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//case "100000151":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "审核通过！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核发生错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//case "100000168":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "审核通过！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核发生错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//case "100000169":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), "", this.User.Id, "1", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "审核通过！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核发生错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//}
 	} else {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
 		svc.GetEntitysByWhere(this.User.AccCode+LimsDateEntryName, where, &list)
@@ -3246,100 +3019,122 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		switch this.User.DepartmentId {
-		case "100000150":
-			receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过审核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		case "100000151":
-			receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过审核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		case "100000168":
-			receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过审核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
-			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
-				errinfo.Code = -1
+		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+		if receiveVal == "true" {
+			err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+			err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+			if err == nil {
+				errinfo.Message = "未通过审核！"
+				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
-			}
-		case "100000169":
-			receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
-			if receiveVal == "true" {
-				err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
-				err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
-				if err == nil {
-					errinfo.Message = "未通过审核！"
-					errinfo.Code = 0
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				} else {
-					errinfo.Message = "审核错误！"
-					errinfo.Code = -1
-					this.Data["json"] = &errinfo
-					this.ServeJSON()
-				}
 			} else {
-				errinfo.Message = "工作流异常，请联系管理员！"
+				errinfo.Message = "审核错误！"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
-				return
 			}
+		} else {
+			errinfo.Message = "工作流异常，请联系管理员！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
 		}
+		//switch this.User.DepartmentId {
+		//case "100000150":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.TJZ_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "未通过审核！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//case "100000151":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "未通过审核！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//case "100000168":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "未通过审核！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//case "100000169":
+		//	receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(list[0].CreateUserId), this.User.Id, "0", dataother.AuditorRemark)
+		//	if receiveVal == "true" {
+		//		err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
+		//		err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)
+		//		if err == nil {
+		//			errinfo.Message = "未通过审核！"
+		//			errinfo.Code = 0
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "审核错误！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
+		//	} else {
+		//		errinfo.Message = "工作流异常，请联系管理员！"
+		//		errinfo.Code = -1
+		//		this.Data["json"] = &errinfo
+		//		this.ServeJSON()
+		//		return
+		//	}
+		//}
 	}
 }
 

src/dashoo.cn/backend/api/controllers/lims/limsentrust.go

@@ -757,7 +757,7 @@ func (this *LimsEnturstController) TaskBalance() {
 				model.DataDoc = testlist[j].DataTemplateName
 				svc.InsertEntityBytbl(this.User.AccCode+LimsTaskBalanceName, &model)
 				//生成数据录入
-				err = svcBalance.CreateDataentry(this.User.AccCode, this.User.Id, LimsTaskBalanceName, LimsDocTemplateName, LimsDocTemplateDetailName, LimsDateEntryName, LimsEntrustMainName, model.Id, this.User.DepartmentId, id)
+				err = svcBalance.CreateDataentry(this.User.AccCode, this.User.Id, this.User.DepartmentId, LimsTaskBalanceName, LimsDocTemplateName, LimsDocTemplateDetailName, LimsDateEntryName, LimsEntrustMainName, model.Id, this.User.DepartmentId, id)
 			}
 		}
 

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/_opera/operation.vue

@@ -21,25 +21,13 @@
       </div>
       <el-form label-width="110px" ref="EntityForm" :model="formData">
         <el-row>
-          <!--<el-col :span="8">
-            <el-form-item label="DEMO">
-              <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-                <el-option
-                  v-for="item in wellNoOptions"
-                  :key="item.Id"
-                  :label="item.Value"
-                  :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>-->
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="单位名称" required>
               <el-input v-model="formData.OrganizeName" placeholder="请输入" Readonly style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="审批步骤" required>
               <el-select ref="selectAuditStep" v-model="formData.AuditStepCode" filterable placeholder="请选择" style="width: 100%">
                 <el-option
@@ -52,7 +40,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="角色" required>
               <el-select ref="selectRole" v-model="formData.RoleId" filterable placeholder="请选择" style="width: 100%">
                 <el-option
@@ -64,6 +52,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="工作流" required>
+              <el-select ref="selectWorkFlow" v-model="formData.WorkFlowCord" filterable placeholder="请选择" style="width: 100%">
+                <el-option
+                  v-for="item in WorkFlowOptions"
+                  :key="item.Id"
+                  :label="item.Key"
+                  :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="24">
             <el-form-item label="备注">
@@ -94,6 +94,7 @@
         serviceId: '',
         auditStepOptions: [],
         roleList: [],
+        WorkFlowOptions: [],
         formData: {
           Id: '',
           OrganizeId: '',
@@ -102,6 +103,8 @@
           AuditStepName: '',
           RoleId: '',
           RoleName: '',
+          WorkFlowCord: '',
+          WorkFlowName: '',
           Remark: '',
           IsDelete: '',
           CreateOn: '',
@@ -145,7 +148,7 @@
           this.roleList = res.data.items['RoleList']
           this.formData.OrganizeId = res.data.items['OrganizeId']
           this.formData.OrganizeName = res.data.items['OrganizeName']
-
+          this.WorkFlowOptions = res.data.items['WorkFlow']
           // this.supervisersOptions = res.data.items['Supervisers']
         }).catch(err => {
           console.error(err)
@@ -157,7 +160,10 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-
+            this.formData.AuditStepName = this.$refs.selectAuditStep.selectedLabel + ''
+            this.formData.RoleName = this.$refs.selectRole.selectedLabel + ''
+            this.formData.WorkFlowName = this.$refs.selectWorkFlow.selectedLabel + ''
+            this.formData.OrganizeId = parseInt(this.formData.OrganizeId)
             if (!this.formData.Id) {
               this.addEntity()
             } else {
@@ -194,8 +200,6 @@
           return false
         }
 
-        this.formData.AuditStepName = this.$refs.selectAuditStep.selectedLabel + ''
-        this.formData.RoleName = this.$refs.selectRole.selectedLabel + ''
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -210,7 +210,12 @@
             width: 100,
             sort: true
           },
-
+          {
+            prop: 'WorkFlowName',
+            label: '工作流名称',
+            width: 100,
+            sort: true
+          },
           {
             prop: 'Remark',
             label: '备注',