增加审批流程回退功能,更新文件:ServiceBase.cs、WorkFlowManager.cs、Sys_WorkFlowController.cs、前端viewgrid文件夹(回退使用方法见后台开发文档上审批方法)

Author: [email protected]

.Net6版本/VOL.Core/BaseProvider/ServiceBase.cs

@@ -535,6 +535,7 @@ public virtual WebResponseContent Add(SaveModel saveDataModel)
             if (saveDataModel.DetailData == null || saveDataModel.DetailData.Count == 0)
             {
                 T mainEntity = saveDataModel.MainData.DicToEntity<T>();
+                SetAuditDefaultValue(mainEntity);
                 if (base.AddOnExecuting != null)
                 {
                     Response = base.AddOnExecuting(mainEntity, null);
@@ -582,6 +583,7 @@ public WebResponseContent Add<TDetail>(T entity, List<TDetail> list = null, bool
         {
             //设置用户默认值
             entity.SetCreateDefaultVal();
+            SetAuditDefaultValue(entity);
             if (validationEntity)
             {
                 Response = entity.ValidationEntity();
@@ -631,6 +633,32 @@ public WebResponseContent Add<TDetail>(T entity, List<TDetail> list = null, bool
             return Response;
         }
 
+        /// <summary>
+        /// 设置审批字段默认值
+        /// </summary>
+        /// <param name="entity"></param>
+        private void SetAuditDefaultValue(T entity)
+        {
+            if (!WorkFlowManager.Exists<T>())
+            {
+                return;
+            }
+            var propertity = TProperties.Where(x => x.Name.ToLower() == "auditstatus").FirstOrDefault();
+            if (propertity != null && propertity.GetValue(entity) == null)
+            {
+                propertity.SetValue(entity, 0);
+            }
+        }
+        /// <summary>
+        /// 写入流程
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="entity"></param>
+        /// <param name="changeTableStatus">是否修改原表的审批状态</param>
+        protected void RewriteFlow(T entity,bool changeTableStatus = true) 
+        {
+            WorkFlowManager.AddProcese(entity, true, changeTableStatus);
+        }
         private void AddProcese(T entity)
         {
             if (!CheckResponseResult() && WorkFlowManager.Exists<T>())
@@ -641,8 +669,7 @@ private void AddProcese(T entity)
                 }
                 //写入流程
                 WorkFlowManager.AddProcese<T>(entity);
-                WorkFlowManager.Audit<T>(entity,AuditStatus.审核中,null,null,null,null, init: true, initInvoke: AddWorkFlowExecuted);
-
+                WorkFlowManager.Audit<T>(entity, AuditStatus.审核中, null, null, null, null, init: true, initInvoke: AddWorkFlowExecuted);
             }
         }
 
@@ -1159,8 +1186,6 @@ public virtual WebResponseContent Audit(object[] keys, int? auditStatus, string
         {
             if (keys == null || keys.Length == 0)
                 return Response.Error("未获取到参数!");
-            if (auditStatus != 1 && auditStatus != 2)
-                return Response.Error("请提求正确的审核结果!");
 
             Expression<Func<T, bool>> whereExpression = typeof(T).GetKeyName().CreateExpression<T>(keys[0], LinqExpressionType.Equal);
             T entity = repository.FindAsIQueryable(whereExpression).FirstOrDefault();
@@ -1179,8 +1204,15 @@ public virtual WebResponseContent Audit(object[] keys, int? auditStatus, string
                 {
                     return Response.Error("只能审批审核中的数据");
                 }
-                WorkFlowManager.Audit<T>(entity, status, auditReason, auditProperty, AuditWorkFlowExecuting, AuditWorkFlowExecuted);
-                return Response.OK("审核成功!");
+                Response = repository.DbContextBeginTransaction(() =>
+                {
+                    return WorkFlowManager.Audit<T>(entity, status, auditReason, auditProperty, AuditWorkFlowExecuting, AuditWorkFlowExecuted);
+                });
+                if (Response.Status)
+                {
+                    return Response.OK(ResponseType.AuditSuccess);
+                }
+                return Response.Error(Response.Message??"审批失败");
             }
 
 
@@ -1230,13 +1262,21 @@ public virtual WebResponseContent Audit(object[] keys, int? auditStatus, string
                 Response = AuditOnExecuting(auditList);
                 if (CheckResponseResult()) return Response;
             }
-            repository.UpdateRange(auditList, updateFileds.Select(x => x.Name).ToArray(), true);
-            if (base.AuditOnExecuted != null)
+            Response = repository.DbContextBeginTransaction(() =>
             {
-                Response = AuditOnExecuted(auditList);
-                if (CheckResponseResult()) return Response;
+                repository.UpdateRange(auditList, updateFileds.Select(x => x.Name).ToArray(), true);
+                if (base.AuditOnExecuted != null)
+                {
+                    Response = AuditOnExecuted(auditList);
+                    if (CheckResponseResult()) return Response;
+                }
+                return Response.OK();
+            });
+            if (Response.Status)
+            {
+                return Response.OK(ResponseType.AuditSuccess);
             }
-            return Response.OK(ResponseType.AuditSuccess);
+            return Response.Error(Response.Message);
         }
 
         public virtual (string, T, bool) ApiValidate(string bizContent, Expression<Func<T, object>> expression = null)

.Net6版本/VOL.Core/WorkFlow/WorkFlowManager.cs

@@ -41,13 +41,69 @@ public static int GetAuditStatus<T>(string value)
                    .FirstOrDefault();
         }
 
+        private static void Rewrite<T>(T entity, Sys_WorkFlow workFlow,bool changeTableStatus) where T:class
+        {
+            var autditProperty = typeof(T).GetProperties().Where(x => x.Name.ToLower() == "auditstatus").FirstOrDefault();
+            if (autditProperty == null)
+            {
+                return;
+            }
+
+            string value = typeof(T).GetKeyProperty().GetValue(entity).ToString();
+
+            var dbContext = DBServerProvider.DbContext;
+
+
+            var workTable = dbContext.Set<Sys_WorkFlowTable>().Where(x => x.WorkTableKey == value && x.WorkFlow_Id == workFlow.WorkFlow_Id)
+                   .AsNoTracking()
+                  .Include(x => x.Sys_WorkFlowTableStep).FirstOrDefault();
+            if (workTable == null || workFlow.Sys_WorkFlowStep == null)
+            {
+                Console.WriteLine($"未查到流程数据，id：{ workFlow.WorkFlow_Id}");
+                return;
+            }
+            workTable.CurrentOrderId = 1;
+            workTable.AuditStatus = (int)AuditStatus.审核中;
+            workTable.Sys_WorkFlowTableStep.ForEach(item =>
+            {
+                item.Enable = 0;
+            });
+
+            if (changeTableStatus)
+            {
+                dbContext.Entry(entity).State = EntityState.Detached;
+                autditProperty.SetValue(entity, 0);
+                dbContext.Entry(entity).Property(autditProperty.Name).IsModified = true;
+            }
 
+            var wlowTableStep = workFlow.Sys_WorkFlowStep.OrderBy(x => x.OrderId).Select(s => new Sys_WorkFlowTableStep()
+            {
+                Sys_WorkFlowTableStep_Id = Guid.NewGuid(),
+                WorkFlowTable_Id = workTable.WorkFlowTable_Id,
+                WorkFlow_Id = s.WorkFlow_Id,
+                StepId = s.StepId,
+                StepName = s.StepName,
+                AuditId = s.StepType == (int)AuditType.用户审批 ? s.StepValue : null,
+                StepType = s.StepType,
+                StepValue = s.StepValue,
+                OrderId = s.OrderId,
+                Enable = 1,
+                CreateDate = DateTime.Now,
+            }).ToList();
+            dbContext.Entry(workTable).State = EntityState.Detached;
+            dbContext.Update(workTable);
+            dbContext.AddRange(wlowTableStep);
+            dbContext.SaveChanges();
+
+        }
         /// <summary>
         /// 写入流程
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="entity"></param>
-        public static void AddProcese<T>(T entity, bool rewrite = false)
+        /// <param name="rewrite">是否重新生成流程</param>
+        /// <param name="changeTableStatus">是否修改原表的审批状态</param>
+        public static void AddProcese<T>(T entity, bool rewrite = false,bool changeTableStatus=true) where T:class
         {
             string workTable = typeof(T).GetEntityTableName();
 
@@ -57,6 +113,12 @@ public static void AddProcese<T>(T entity, bool rewrite = false)
                 .FirstOrDefault();
 
             if (workFlow == null || workFlow.Sys_WorkFlowStep.Count == 0) return;
+            //重新生成流程
+            if (rewrite)
+            {
+                Rewrite(entity, workFlow,changeTableStatus);
+                return;
+            }
 
             var userInfo = UserContext.Current.UserInfo;
             Guid workFlowTable_Id = Guid.NewGuid();
@@ -195,10 +257,16 @@ public static WebResponseContent Audit<T>(T entity, AuditStatus status, string r
             currnetStep.AuditDate = DateTime.Now;
             currnetStep.AuditStatus = (int)status;
             currnetStep.Remark = remark;
+
+
+            //dbContext.Entry(workFlow).Property("CurrentOrderId").IsModified = true;
+            //dbContext.Entry(workFlow).Property("AuditStatus").IsModified = true;
+
+
             dbContext.Set<Sys_WorkFlowTable>().Update(workFlow);
 
             dbContext.SaveChanges();
-
+            dbContext.Entry(workFlow).State = EntityState.Detached;
             if (workFlowExecuted != null)
             {
                 webResponse = workFlowExecuted.Invoke(entity, status, GetAuditUserIds(nextStep?.StepType ?? 0), isLast);

.Net6版本/VOL.WebApi/Controllers/System/Partial/Sys_WorkFlowController.cs

@@ -89,27 +89,33 @@ public async Task<IActionResult> GetSteps(string tableName, string id)
 
             var user = UserContext.Current.UserInfo;
             List<int> stepValues = flow.Sys_WorkFlowTableStep.Select(s => s.StepValue ?? 0).ToList();
-            var users = _userRepository.FindAsIQueryable(x => true)
-                                        .Select(u => new { u.User_Id, u.UserTrueName });
+
+            var auditUsers = flow.Sys_WorkFlowTableStep.Where(x => x.AuditId > 0).Select(s => s.AuditId).ToArray();
+            var users = await _userRepository.FindAsIQueryable(x => auditUsers.Contains(x.User_Id))
+                                        .Select(u => new { u.User_Id, u.UserTrueName }).ToListAsync();
+
+            var steps = flow.Sys_WorkFlowTableStep
+                    .Select(c => new
+                    {
+                        c.AuditId,
+                        Auditor = users.Where(us => us.User_Id == c.AuditId).Select(us => us.UserTrueName).FirstOrDefault(),
+                        c.AuditDate,
+                        c.AuditStatus,
+                        c.Remark,
+                        c.StepValue,
+                        c.StepName,
+                        c.OrderId,
+                        c.Enable,
+                        //判断是按角色审批 还是用户帐号审批
+                        isCurrentUser = (c.AuditStatus ?? 0) == (int)AuditStatus.审核中 && c.OrderId == flow.CurrentOrderId && GetAuditStepValue(c.StepType) == c.StepValue,
+                        isCurrent = c.OrderId == flow.CurrentOrderId && c.AuditStatus != (int)AuditStatus.审核通过
+                    }).OrderBy(o => o.OrderId);
             var data = new
             {
                 step = flow.CurrentOrderId,
                 flow.AuditStatus,
-                list = flow.Sys_WorkFlowTableStep
-                   .Select(c => new
-                   {
-                       c.AuditId,
-                       Auditor = users.Where(us => us.User_Id == c.AuditId).Select(us => us.UserTrueName).FirstOrDefault(),
-                       c.AuditDate,
-                       c.AuditStatus,
-                       c.Remark,
-                       c.StepValue,
-                       c.StepName,
-                       c.OrderId,
-                       //判断是按角色审批 还是用户帐号审批
-                       isCurrentUser = (c.AuditStatus ?? 0) == (int)AuditStatus.审核中 && c.OrderId == flow.CurrentOrderId && GetAuditStepValue(c.StepType) == c.StepValue,
-                       isCurrent = c.OrderId == flow.CurrentOrderId && c.AuditStatus != (int)AuditStatus.审核通过
-                   }).OrderBy(o => o.OrderId)
+                list = steps.Where(x => (x.Enable == null || x.Enable > 0)).ToList(),
+                his = steps.Where(x => x.AuditId > 0 &&x.AuditStatus>0 && x.Enable == 0).ToList(),
             };
 
             return Json(data);

Vol.Vue3版本/src/components/basic/ViewGrid/AuditHis.vue

@@ -0,0 +1,46 @@
+<template>
+  <vol-table
+    :tableData="tableData"
+    :columns="columns"
+    :height="411"
+    :pagination-hide="true"
+    :load-key="false"
+    :text-inline="false"
+    :ck="false"
+  ></vol-table>
+</template>
+<script>
+import VolTable from '@/components/basic/VolTable.vue';
+import {
+  defineComponent,
+  ref,
+  reactive,
+  toRefs,
+  getCurrentInstance
+} from 'vue';
+export default defineComponent({
+  components: {
+    VolTable
+  },
+  props: {
+    tableData: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    }
+  },
+  setup() {
+    const columns = reactive([
+      { title: '节点', field: 'stepName' },
+      { title: '审批人', field: 'auditor' },
+      { title: '审批结果', field: 'auditStatus' },
+      { title: '审批时间', field: 'auditDate',width:150 },
+      { title: '备注', field: 'remark' }
+    ]);
+    return {
+        columns
+    }
+  }
+});
+</script>