工作流校核

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

@@ -59,6 +59,10 @@ 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"
 )
 
 type TableDetailData struct {

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

@@ -1,6 +1,7 @@
 package lims
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/limsreportalercarbon"
 	"dashoo.cn/backend/api/business/limsreportalerfhgas"
 	"dashoo.cn/backend/api/business/limsreportalerkrgas"
@@ -2597,17 +2598,22 @@ func (this *LimsDataEntryController) Signature() {
 // @router /getuserlistbyjhrole/ [get]
 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 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 "100000169":
+	//	users = svc.GetUserByRole("10000195", this.User.AccCode)
 	case "100000168":
 		users = svc.GetUserByRole("10000201", this.User.AccCode)
+	default:
+		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.JN_JIAOHE, &RoleSet)
+		users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
 	}
 
 
@@ -2766,7 +2772,10 @@ func (this *LimsDataEntryController) CheckSubmit() {
 					return
 				}
 			case "100000169":
-				users = svc.GetUserByRole("10000196", this.User.AccCode)
+				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) + ","
 				}
@@ -2940,6 +2949,68 @@ func (this *LimsDataEntryController) JiaoHe() {
 				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
+				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.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
 		}
 	} else {
 		where := " Id = '" + strconv.Itoa(dataother.DataEntryId) + "'"
@@ -2994,6 +3065,40 @@ func (this *LimsDataEntryController) JiaoHe() {
 					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()
+				}
+			}
 		}
 	}
 }
@@ -3188,6 +3293,52 @@ func (this *LimsDataEntryController) ShenHeDataEntry() {
 				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/frontend_web/src/pages/lims/reportliquidtransportation/_opera/operation.vue

@@ -731,7 +731,7 @@
       },
       // 打开校核弹窗
       jiaoheshowdialog () {
-        this.jiaoheForm.DataEntryId = this.queryParams.DataEntryId
+        this.jiaoheForm.DataEntryId = this.DataEntryId
         this.jiaoheshow = true
       },
       checkstatus () {

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

@@ -38,7 +38,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" width="160" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/auditsetting/' + scope.row.Id + '/operation'">
+            <router-link :to="'/system/auditsetting/' + scope.row.Id + '/operation'">
               <el-button type="primary" title="编辑" size="mini">编辑</el-button>
             </router-link>