Commit d698dd71 authored by 黄奎's avatar 黄奎

新增流程设置

parent e69115bd
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.Flow namespace Edu.Model.Entity.Flow
{ {
/// <summary> /// <summary>
/// 流程节点审核信息实体 /// 流程节点审核信息实体
/// </summary> /// </summary>
public class RB_Flow_AduitInfo [Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Flow_AduitInfo
{ {
/// <summary> /// <summary>
/// 主键编号 /// 主键编号
...@@ -24,6 +27,11 @@ namespace Edu.Model.Entity.Flow ...@@ -24,6 +27,11 @@ namespace Edu.Model.Entity.Flow
/// </summary> /// </summary>
public int FlowId { get; set; } public int FlowId { get; set; }
/// <summary>
/// 审核人民说明信息(比如:关联销售,指定成员名称)
/// </summary>
public string AduitName { get; set; }
/// <summary> /// <summary>
/// 审核类型(1-指定人员,2-指定角色) /// 审核类型(1-指定人员,2-指定角色)
/// </summary> /// </summary>
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.Flow namespace Edu.Model.Entity.Flow
{ {
/// <summary> /// <summary>
/// 流程节点实体类 /// 流程节点实体类
/// </summary> /// </summary>
public class RB_Flow_Node [Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Flow_Node
{ {
/// <summary> /// <summary>
/// 节点编号(主键) /// 节点编号(主键)
......
...@@ -52,11 +52,11 @@ namespace Edu.Module.System ...@@ -52,11 +52,11 @@ namespace Edu.Module.System
/// <summary> /// <summary>
/// 获取流程信息 /// 获取流程信息
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="FlowId"></param>
/// <returns></returns> /// <returns></returns>
public RB_Flow_ViewModel GetFlowModule(object Id) public RB_Flow_ViewModel GetFlowModule(object FlowId)
{ {
var extModel = flowRepository.GetEntity<RB_Flow_ViewModel>(Id); var extModel = flowRepository.GetEntity<RB_Flow_ViewModel>(FlowId);
if (extModel != null) if (extModel != null)
{ {
if (extModel.FlowId > 0) if (extModel.FlowId > 0)
......
...@@ -330,9 +330,14 @@ FROM ...@@ -330,9 +330,14 @@ FROM
LEFT JOIN rb_school AS s ON A.School_Id=s.SId LEFT JOIN rb_school AS s ON A.School_Id=s.SId
LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId
LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId
LEFT JOIN (SELECT AccountId,AccountType,MAX(Content) as AccountRemark from rb_accountremark where Group_Id=100000 and `Status`=0 GROUP BY AccountId,AccountType ORDER BY CreateTime desc) LEFT JOIN (
as ar on a.AccountId=ar.AccountId and A.AccountType=ar.AccountType SELECT AccountId,AccountType,MAX(Content) AS AccountRemark
WHERE 1=1 {4} FROM rb_accountremark
WHERE `Status`=0
GROUP BY AccountId,AccountType
ORDER BY CreateTime DESC
) AS ar on a.AccountId=ar.AccountId AND A.AccountType=ar.AccountType
WHERE 1=1 {4}
", where.ToString(), wheremanager.ToString(), whereteacher.ToString(), whereassist.ToString(), where2.ToString()); ", where.ToString(), wheremanager.ToString(), whereteacher.ToString(), whereassist.ToString(), where2.ToString());
return builder.ToString(); return builder.ToString();
} }
......
...@@ -25,7 +25,7 @@ namespace Edu.WebApi.Controllers.Public ...@@ -25,7 +25,7 @@ namespace Edu.WebApi.Controllers.Public
/// <summary> /// <summary>
/// 流程设置处理类对象 /// 流程设置处理类对象
/// </summary> /// </summary>
private readonly BasicFlowModule basicFlowModule = new BasicFlowModule(); private readonly BasicFlowModule basicFlowModule = AOP.AOPHelper.CreateAOPObject<BasicFlowModule>();
/// <summary> /// <summary>
...@@ -35,8 +35,8 @@ namespace Edu.WebApi.Controllers.Public ...@@ -35,8 +35,8 @@ namespace Edu.WebApi.Controllers.Public
[HttpPost] [HttpPost]
public ApiResult GetBackClassFlow() public ApiResult GetBackClassFlow()
{ {
var Id = base.ParmJObj.GetInt("Id"); var FlowId = base.ParmJObj.GetInt("FlowId");
var flowModel = basicFlowModule.GetFlowModule(Id); var flowModel = basicFlowModule.GetFlowModule(FlowId);
return ApiResult.Success(data: flowModel); return ApiResult.Success(data: flowModel);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment