auditsetting

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

@@ -247,7 +247,7 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 		//启动数据录入工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var processInstanceId string
-		var RoleSet auditsetting.Base_OilAuditSetting
+		var RoleSet auditsetting.BaseOilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 		rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting",DeptID,workflow.DATAAUDIT, &RoleSet)
 		processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])

src/dashoo.cn/backend/api/business/limscreatereport/limscreatereportService.go

@@ -203,7 +203,7 @@ func (this *CreateReportService) CreateDataentry(DeptID string,AccCode string, t
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity("Base_OilAuditSetting",DeptID,workflow.DATAAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), RecheckUserId)

src/dashoo.cn/backend/api/controllers/base.go

@@ -255,7 +255,6 @@ var (
 	LimsReportDrillCollarName                string = "LimsReportDrillCollar"          //  石油专用管材方钻杆检验记录
 	LimsPetroleUmPipeName                    string = "LimsReportPetroleumPipe"              //  石油专用管材钻铤检验记录
 
-	OilAuditSettingName                          string = "Base_OilAuditSetting" // 单位审批步骤自定义配置
 )
 
 //分页信息及数据

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

@@ -138,7 +138,7 @@ func (this *CreateReportController) GetCreateReportToDoList() {
 	//工作流获取代办事务
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
@@ -743,7 +743,7 @@ func (this *CreateReportController) ReportCreateThen(reportUrl string, UnHGRepor
 		}
 		userIds = strings.Trim(userIds, ",")
 
-		var RoleSet auditsetting.Base_OilAuditSetting
+		var RoleSet auditsetting.BaseOilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTAUDIT, &RoleSet)
 
@@ -1595,7 +1595,7 @@ func (this *CreateReportController) ShenHeReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		var RoleSet auditsetting.Base_OilAuditSetting
+		var RoleSet auditsetting.BaseOilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
 		users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
@@ -1641,7 +1641,7 @@ func (this *CreateReportController) ShenHeReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		var RoleSet auditsetting.Base_OilAuditSetting
+		var RoleSet auditsetting.BaseOilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
 		for j:=0;j<len(reportlistall);j++{
@@ -1705,7 +1705,7 @@ func (this *CreateReportController) QianfaReport() {
 	var dataother ShenHeModel
 	json.Unmarshal(jsonblob, &dataother)
 	var list []limscreatereport.LimsCreateReport
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
 	//审核状态判断进行的操作
@@ -1867,7 +1867,7 @@ func (this *CreateReportController) DelReport() {
 		//提交审核工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var receiveVal string
-		var RoleSet auditsetting.Base_OilAuditSetting
+		var RoleSet auditsetting.BaseOilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.REPORTISSUE, &RoleSet)
 		receiveVal = svcActiviti.TaskComplete(RoleSet.WorkFlowCord, Id, "", this.User.Id, "0", "特检删除报告")

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

@@ -156,7 +156,7 @@ func (this *LimsDataEntryController) GetToDoList() {
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
@@ -2604,7 +2604,7 @@ func (this *LimsDataEntryController) GetUserListByJHRole() {
 	svc := limsdataentry.GetLimsDataEntryService(utils.DBE)
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	var users []userRole.Base_RoleList
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAJIAOHE, &RoleSet)
 	users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
 	//var errinfo ErrorInfo
@@ -2630,7 +2630,7 @@ 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
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAJIAOHE, &RoleSet)
 	if dataentrymodel.DocKey == "" {
@@ -2672,7 +2672,7 @@ func (this *LimsDataEntryController) CheckSubmit() {
 			//提交校核工作流
 			svcActiviti := workflow.GetActivitiService(utils.DBE)
 			var receiveVal string
-			var auditWorkflow auditsetting.Base_OilAuditSetting
+			var auditWorkflow auditsetting.BaseOilAuditSetting
 			rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 			rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &auditWorkflow)
 			users = svc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
@@ -2763,7 +2763,7 @@ func (this *LimsDataEntryController) JiaoHe() {
 	currentTime := time.Now().Format("060102150405") //当前时间
 	var users []userRole.Base_RoleList
 	var userIds string
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
 	//审核状态判断进行的操作
@@ -2862,7 +2862,7 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 	json.Unmarshal(jsonblob, &dataother)
 	var list []limsdataentry.LimsDateEntry
 	currentTime := time.Now().Format("060102150405") //当前时间
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
 	//审核状态判断进行的操作
@@ -4082,7 +4082,7 @@ func (this *LimsDataEntryController) AddDataEntryThen() {
 		//启动数据录入工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		var processInstanceId string
-		var RoleSet auditsetting.Base_OilAuditSetting
+		var RoleSet auditsetting.BaseOilAuditSetting
 		rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
 		processInstanceId = svcActiviti.StartProcess(RoleSet.WorkFlowCord, strconv.Itoa(dataentryentity.Id), strconv.Itoa(addmessa.ConUserId))

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

@@ -42,7 +42,7 @@ func (this *LimsIndexController) GetWaiting() {
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
@@ -87,7 +87,7 @@ func (this *LimsIndexController) GetDone() {
 	//启动数据录入工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
-	var RoleSet auditsetting.Base_OilAuditSetting
+	var RoleSet auditsetting.BaseOilAuditSetting
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.DATAAUDIT, &RoleSet)
 	processInstanceId = svcActiviti.GetHistoryMyTasks(RoleSet.WorkFlowCord, this.User.Id)