提交

username@email.com

2024-04-02 5b46930255ec185a906d07165f9d0dc91c300ab8

提交

 CoreCms.Net.Model/Entities/baifenbingfa/apply/applyModel.cs

@@ -6,6 +6,7 @@
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;

@@ -31,6 +32,13 @@
        public string managerID {  get; set; }

        /// <summary>
        /// 审批人名称用,分割
        /// </summary>
        [Display(Name = "审批人名称用,分割")]
        [SugarColumn(ColumnDescription = "审批人名称", IsNullable = true)]
        public string managerName { get; set; }

        /// <summary>
        /// 审批角色ID，号分割
        /// </summary>
        [Display(Name = "审批角色ID")]
@@ -50,6 +58,21 @@
        [Display(Name = "类型")]
        [SugarColumn(ColumnDescription = "类型")]
        public applyType aType { get; set; }

        /// <summary>
        /// 类型        
        /// </summary>
        [Display(Name = "审批状态")]
        [SugarColumn(ColumnDescription = "审批状态")]
        public applyStataType ayStataType { get; set; }

        
        /// <summary>
        /// 用户ID       
        /// </summary>
        [Display(Name = "用户ID")]
        [SugarColumn(ColumnDescription = "用户ID")]
        public int userID { get; set; }


        /// <summary>
@@ -80,6 +103,18 @@
        [Display(Name = "调整数据")]
        [SugarColumn(ColumnDescription = "调整数据")]
        public string data { get; set; }

        /// <summary>
        /// 创建人
        /// </summary>		
        [SugarColumn(ColumnDescription = "创建人", IsNullable = true)]
        public int createById { get; set; }

        /// <summary>
        /// 修改人
        /// </summary>		
        [SugarColumn(ColumnDescription = "修改人", IsNullable = true)]
        public int upDataById { get; set; }
    }

    /// <summary>
@@ -128,4 +163,30 @@


    }

    /// <summary>
    /// 获取Description
    /// </summary>
    public static class EnumExtensions
    {
        /// <summary>
        /// 获取Description
        /// </summary>
        public static string GetDescription(this Enum value, bool nameInstead = true)
        {
            Type type = value.GetType();
            string name = Enum.GetName(type, value);
            if (name == null)
            {
                return null;
            }
            FieldInfo field = type.GetField(name);
            DescriptionAttribute attribute = field.GetCustomAttribute(typeof(DescriptionAttribute)) as DescriptionAttribute;
            if (attribute == null && nameInstead == true)
            {
                return name;
            }
            return attribute?.Description;
        }
    }
}

 CoreCms.Net.Model/FromBody/FMUpdate.cs

@@ -142,6 +142,12 @@
        public int id { get; set; }

        /// <summary>
        ///     原积分
        /// </summary>
        [Required(ErrorMessage = "请输入原积分")]
        public int oldpoint { get; set; }

        /// <summary>
        ///     积分
        /// </summary>
        [Required(ErrorMessage = "请输入积分")]
@@ -165,6 +171,12 @@
        /// </summary>
        [Required(ErrorMessage = "请输入序列")]
        public int id { get; set; }

        /// <summary>
        /// 原余额
        /// </summary>
        [Required(ErrorMessage = "请输入原余额")]
        public decimal oldbalance { get; set; }

        /// <summary>
        ///     余额
@@ -197,6 +209,12 @@
        [Required(ErrorMessage = "请输入上级序列")]
        public int parentId { get; set; }

        /// <summary>
        ///    原上级序列
        /// </summary>
        [Required(ErrorMessage = "请输入原上级序列")]
        public int oldparentId { get; set; }

    }

    #endregion

 CoreCms.Net.Model/ViewModels/baifenbingfa/applyModelDTO.cs

New file
@@ -0,0 +1,120 @@
using CoreCms.Net.Model.Entities.baifenbingfa.apply;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace CoreCms.Net.Model.ViewModels.baifenbingfa
{
    /// <summary>
    ///     查询审批返回实体
    /// </summary>
    public class applyModelDTO
    {
        /// <summary>
        /// id
        /// </summary>		
        public int id { get; set; }
        /// <summary>
        /// 审批人ID用,分割
        /// </summary>
        public string managerID { get; set; }

        /// <summary>
        /// 审批人名称用,分割
        /// </summary>
        public string managerName { get; set; }

        /// <summary>
        /// 审批角色ID，号分割
        /// </summary>
        public string roleID { get; set; }

        /// <summary>
        /// 审核人数数量        
        /// </summary>
        public int managerApplyCount { get; set; }

        /// <summary>
        /// 类型        
        /// </summary>
        public int aType { get; set; }
        /// <summary>
        /// 类型        
        /// </summary>
        public string aTypeName { get; set; }

        /// <summary>
        /// 类型        
        /// </summary>
        public int ayStataType { get; set; }
        /// <summary>
        /// 类型        
        /// </summary>
        public string ayStataTypeName { get; set; }


        /// <summary>
        /// 用户ID       
        /// </summary>
        public int userID { get; set; }


        /// <summary>
        /// 内容        
        /// </summary>
        public string dec { get; set; }

        /// <summary>
        /// 备注        
        /// </summary>    
        public string reMake { get; set; }

        /// <summary>
        /// 调整前数据        
        /// </summary>
        public string oldData { get; set; }


        /// <summary>
        /// 调整数据        
        /// </summary>
        public string data { get; set; }

        /// <summary>
        /// 创建人
        /// </summary>		
        public int createById { get; set; }

        /// <summary>
        /// 修改人
        /// </summary>		
        public int upDataById { get; set; }

        /// <summary>
        /// 建立时间
        public DateTime? createTime { get; set; }

        /// <summary>
        /// 修改时间
        /// </summary>		
        public DateTime? upDataTime { get; set; }

        /// <summary>
        /// 创建人
        /// </summary>		
        public string createBy { get; set; }

        /// <summary>
        /// 修改人
        /// </summary>		
        public string upDataBy { get; set; }
        /// <summary>
        /// 删除标志
        /// </summary>		
        public bool isdelete { get; set; } = false;
    }
}

 CoreCms.Net.Repository/apply/applyModelRepository.cs

@@ -71,9 +71,12 @@
            //事物处理过程开始
            oldModel.id = entity.id;
            oldModel.managerID = entity.managerID;
            oldModel.managerName = entity.managerName;
            oldModel.roleID = entity.roleID;
            oldModel.managerApplyCount = entity.managerApplyCount;
            oldModel.aType = entity.aType;
            oldModel.ayStataType = entity.ayStataType;
            oldModel.userID = entity.userID;
            oldModel.dec = entity.dec;
            oldModel.reMake = entity.reMake;
            oldModel.oldData = entity.oldData;
@@ -82,6 +85,8 @@
            oldModel.upDataTime = entity.upDataTime;
            oldModel.createBy = entity.createBy;
            oldModel.upDataBy = entity.upDataBy;
            oldModel.createById = entity.createById;
            oldModel.upDataById = entity.upDataById;
            oldModel.isdelete = entity.isdelete;
            
            //事物处理过程结束
@@ -182,9 +187,12 @@
                {
                      id = p.id,
                managerID = p.managerID,
                managerName = p.managerName,
                roleID = p.roleID,
                managerApplyCount = p.managerApplyCount,
                aType = p.aType,
                ayStataType = p.ayStataType,
                userID = p.userID,
                dec = p.dec,
                reMake = p.reMake,
                oldData = p.oldData,
@@ -193,8 +201,10 @@
                upDataTime = p.upDataTime,
                createBy = p.createBy,
                upDataBy = p.upDataBy,
                isdelete = p.isdelete,
                
                    createById = p.createById,
                    upDataById = p.upDataById,
                    isdelete = p.isdelete,

                }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
            }
            else
@@ -205,9 +215,12 @@
                {
                      id = p.id,
                managerID = p.managerID,
                roleID = p.roleID,
                    managerName = p.managerName,
                    roleID = p.roleID,
                managerApplyCount = p.managerApplyCount,
                aType = p.aType,
                ayStataType = p.ayStataType,
                userID = p.userID,
                dec = p.dec,
                reMake = p.reMake,
                oldData = p.oldData,
@@ -216,7 +229,9 @@
                upDataTime = p.upDataTime,
                createBy = p.createBy,
                upDataBy = p.upDataBy,
                isdelete = p.isdelete,
                    createById = p.createById,
                    upDataById = p.upDataById,
                    isdelete = p.isdelete,
                
                }).ToPageListAsync(pageIndex, pageSize, totalCount);
            }

 CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs

@@ -14,13 +14,16 @@
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.Auth.HttpContextUser;
using CoreCms.Net.Configuration;
using CoreCms.Net.Filter;
using CoreCms.Net.IServices;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.Entities.baifenbingfa.apply;
using CoreCms.Net.Model.Entities.Expression;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Services;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using CoreCms.Net.Web.Admin.Infrastructure;
@@ -47,6 +50,8 @@
        private readonly ICoreCmsUserPointLogServices _coreCmsUserPointLogServices;
        private readonly ICoreCmsUserServices _coreCmsUserServices;
        private readonly IWebHostEnvironment _webHostEnvironment;
        private readonly IHttpContextUser _httpContextUser;
        private readonly IapplyModelServices _applyModelServices;


        /// <summary>
@@ -57,12 +62,16 @@
        /// <param name="coreCmsUserGradeServices"></param>
        /// <param name="coreCmsUserBalanceServices"></param>
        /// <param name="coreCmsUserPointLogServices"></param>
        ///  <param name="httpContextUser"></param>
        ///  <param name="applyModelServices"></param>
        public CoreCmsUserController(
            IWebHostEnvironment webHostEnvironment
            , ICoreCmsUserServices coreCmsUserServices
            , ICoreCmsUserGradeServices coreCmsUserGradeServices
            , ICoreCmsUserBalanceServices coreCmsUserBalanceServices
            , ICoreCmsUserPointLogServices coreCmsUserPointLogServices
            , IHttpContextUser httpContextUser
            , IapplyModelServices applyModelServices
        )
        {
            _webHostEnvironment = webHostEnvironment;
@@ -70,6 +79,8 @@
            _coreCmsUserGradeServices = coreCmsUserGradeServices;
            _coreCmsUserBalanceServices = coreCmsUserBalanceServices;
            _coreCmsUserPointLogServices = coreCmsUserPointLogServices;
            _httpContextUser = httpContextUser;
            _applyModelServices = applyModelServices;
        }

        #region 获取列表============================================================
@@ -994,7 +1005,43 @@
        [Description("修改余额提交")]
        public async Task<AdminUiCallBack> DoEditBalance([FromBody] FMUpdateUserBalance entity)
        {
            var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.balance, entity.memo);
            var jm = new AdminUiCallBack();
            var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
            if (model == null)
            {
                jm.msg = "不存在此信息";
                return jm;
            }
            var id = _httpContextUser.ID;
            var name = _httpContextUser.Name;

            applyModel entity1 = new applyModel();
            //entity1.id = 0;
            entity1.managerID = null;
            entity1.roleID = "shenpi";
            entity1.managerApplyCount = 2;

            entity1.aType = applyType.Balance;
            entity1.ayStataType = applyStataType.applying;
            entity1.userID = entity.id;
            entity1.dec = "用户"+ model.nickName + "余额调整";
            entity1.reMake = entity.memo;
            entity1.oldData = entity.oldbalance+"";
            entity1.data = entity.balance+"";
            entity1.createTime = DateTime.Now;
            entity1.upDataTime = entity1.createTime;
            entity1.createBy = name;
            entity1.upDataBy = name;
            entity1.createById = id;
            entity1.upDataById = id;
            entity1.isdelete = false;

            jm = await _applyModelServices.InsertAsync(entity1);

            

           // var jm = await _coreCmsUserServices.UpdateBalance(entity.id, entity.balance, entity.memo);
            jm.msg = "数据提交审核成功";
            return jm;
        }

@@ -1041,7 +1088,41 @@
        [Description("修改积分提交")]
        public async Task<AdminUiCallBack> DoEditPoint([FromBody] FMUpdateUserPoint entity)
        {
            var jm = await _coreCmsUserServices.UpdatePiont(entity);
            var jm = new AdminUiCallBack(); 
            var model = await _coreCmsUserServices.QueryByIdAsync(entity.id);
            if (model == null)
            {
                jm.msg = "不存在此信息";
                return jm;
            }

            var id = _httpContextUser.ID;
            var name = _httpContextUser.Name;

            applyModel entity1 = new applyModel();
            //entity1.id = 0;
            entity1.managerID = null;
            entity1.roleID = "shenpi";
            entity1.managerApplyCount = 2;

            entity1.aType = applyType.points;
            entity1.ayStataType = applyStataType.applying;
            entity1.userID = entity.id;
            entity1.dec = "用户" + model.nickName + "积分调整";
            entity1.reMake = entity.memo;
            entity1.oldData = entity.oldpoint + "";
            entity1.data = entity.point + "";
            entity1.createTime = DateTime.Now;
            entity1.upDataTime = entity1.createTime;
            entity1.createBy = name;
            entity1.upDataBy = name;
            entity1.createById = id;
            entity1.upDataById = id;
            entity1.isdelete = false;

            jm = await _applyModelServices.InsertAsync(entity1);
            jm.msg = "数据提交审核成功";
            // var jm = await _coreCmsUserServices.UpdatePiont(entity);
            return jm;
        }

@@ -1137,10 +1218,40 @@
                entity.parentId = 0;
            }

            var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = entity.parentId }, p => p.id == model.id);
           // var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = entity.parentId }, p => p.id == model.id);

            jm.code = bl ? 0 : 1;
            jm.msg = bl ? "更新成功" : "更新失败";

            var id = _httpContextUser.ID;
            var name = _httpContextUser.Name;

            applyModel entity1 = new applyModel();
            //entity1.id = 0;
            entity1.managerID = null;
            entity1.roleID = "shenpi";
            entity1.managerApplyCount = 2;

            entity1.aType = applyType.Referrer;
            entity1.ayStataType = applyStataType.applying;
            entity1.userID = entity.id;
            entity1.dec = "用户" + model.nickName + "推荐人调整";
            entity1.reMake = "";
            entity1.oldData = entity.oldparentId + "";
            entity1.data = entity.parentId + "";
            entity1.createTime = DateTime.Now;
            entity1.upDataTime = entity1.createTime;
            entity1.createBy = name;
            entity1.upDataBy = name;
            entity1.createById = id;
            entity1.upDataById = id;
            entity1.isdelete = false;

            jm = await _applyModelServices.InsertAsync(entity1);

            jm.msg = "数据提交审核成功";




            return jm;
        }


 CoreCms.Net.Web.Admin/Controllers/apply/applyModelController.cs

@@ -32,6 +32,11 @@
using SqlSugar;
using CoreCms.Net.Web.Admin.Infrastructure;
using CoreCms.Net.Model.Entities.baifenbingfa.apply;
using CoreCms.Net.Model.ViewModels.baifenbingfa;
using CoreCms.Net.Auth.HttpContextUser;
using Essensoft.Paylink.Alipay.Domain;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using K4os.Compression.LZ4.Internal;

namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -47,16 +52,28 @@
    {
        private readonly IWebHostEnvironment _webHostEnvironment;
        private readonly IapplyModelServices _applyModelServices;
        private readonly IHttpContextUser _httpContextUser;
        private readonly ICoreCmsUserServices _coreCmsUserServices;
        private readonly ISysRoleServices _sysRoleServices;
        private readonly ISysUserRoleServices _sysUserRoleServices;

        /// <summary>
        /// 构造函数
        ///</summary>
        public applyModelController(IWebHostEnvironment webHostEnvironment
            ,IapplyModelServices applyModelServices
              , IHttpContextUser httpContextUser
             , ICoreCmsUserServices coreCmsUserServices
             , ISysRoleServices sysRoleServices 
           ,  ISysUserRoleServices sysUserRoleServices 
            )
        {
            _webHostEnvironment = webHostEnvironment;
            _applyModelServices = applyModelServices;
            _httpContextUser = httpContextUser;
            _coreCmsUserServices = coreCmsUserServices;
            _sysRoleServices = sysRoleServices;
            _sysUserRoleServices = sysUserRoleServices;
        }

        #region 获取列表============================================================
@@ -282,8 +299,77 @@
                jm.msg = "不存在此信息";
                return jm;
            }
            //审批逻辑
            //判断审批状态是否可以审批
            if (model.ayStataType != applyStataType.applying)
            {
                jm.msg = "信息已经审批结束";
                return jm;
            }
            //查询审批角色里边是否有当前人，当前人是否已经审批过了
            var id = _httpContextUser.ID;
            var name = _httpContextUser.Name;

          var shenpirole =  _sysRoleServices.QueryListByClause(x=>x.roleCode == model.roleID).FirstOrDefault();
            if (shenpirole != null)
            {
             var shenpiren =   _sysUserRoleServices.QueryListByClause(x => x.roleId == shenpirole.id && x.userId == id).FirstOrDefault();
                if(shenpiren == null)
                {
                    jm.msg = "你不是审批人";
                    return jm;
                }
            }
            else
            {
                jm.msg = "没有审批角色";
                return jm;
            }


            if (!string.IsNullOrEmpty(model.managerID))
            {
                var managerID = model.managerID.Split(',');
                var sid = id + "";
                var managerIDs = managerID.Where(x => x == sid).FirstOrDefault();

                if (!string.IsNullOrEmpty(managerIDs))
                {
                    jm.msg = "你已经审批过了";
                    return jm;
                }
            }
            



            var modelDTO = new applyModelDTO();
            modelDTO.id = model.id;

            modelDTO.id = model.id;
            modelDTO.managerID = model.managerID;
            modelDTO.managerName = model.managerName;
            modelDTO.roleID = model.roleID;
            modelDTO.managerApplyCount = model.managerApplyCount;
            modelDTO.aType = (int)model.aType;
            modelDTO.aTypeName = model.aType.GetDescription();
            modelDTO.ayStataType = (int)model.ayStataType;
            modelDTO.ayStataTypeName = model.ayStataType.GetDescription();
            modelDTO.userID = model.userID;
            modelDTO.dec = model.dec;
            modelDTO.reMake = model.reMake;
            modelDTO.oldData = model.oldData;
            modelDTO.data = model.data;
            modelDTO.createById = model.createById;
            modelDTO.upDataById = model.upDataById;
            modelDTO.createTime = model.createTime;
            modelDTO.upDataTime = model.upDataTime;
            modelDTO.createBy = model.createBy;
            modelDTO.upDataBy = model.upDataBy;
            modelDTO.isdelete = model.isdelete;
            modelDTO.isdelete = true;
            jm.code = 0;
            jm.data = model;
            jm.data = modelDTO;

            return jm;
        }
@@ -300,7 +386,120 @@
        [Description("编辑提交")]
        public async Task<AdminUiCallBack> DoEdit([FromBody]applyModel entity)
        {
            var jm = await _applyModelServices.UpdateAsync(entity);
          

            var applyModel = await _applyModelServices.QueryByIdAsync(entity.id, false);
            var jm = new AdminUiCallBack();
            if (applyModel == null)
            {
                jm.msg = "不存在此信息";
                return jm;
            }
            //审批逻辑
            //判断审批状态是否可以审批
            if (applyModel.ayStataType != applyStataType.applying)
            {
                jm.msg = "信息已经审批结束";
                return jm;
            }
            var id = _httpContextUser.ID;
            var name = _httpContextUser.Name;
            if (!string.IsNullOrEmpty(applyModel.managerID))
            {
                var managerID = applyModel.managerID.Split(',');
                var sid = id + "";
                var managerIDs = managerID.Where(x => x == sid).FirstOrDefault();

                if (!string.IsNullOrEmpty(managerIDs))
                {
                    jm.msg = "你已经审批过了";
                    return jm;
                } 
            }

            //同意还是拒绝
          
            if (entity.isdelete == true)
            {
                if (string.IsNullOrEmpty(applyModel.managerID))
                {
                    if(applyModel.managerApplyCount == 1)
                    {
                        applyModel.ayStataType = applyStataType.ok;
                    }
                    else
                    {
                        applyModel.ayStataType = applyStataType.applying;
                    }
                    applyModel.managerID = id + "";
                    applyModel.managerName = name + "";
                }
                else
                {
                   var managerID = applyModel.managerID.Split(',');
                    if(managerID.Length +1 < applyModel.managerApplyCount)
                    {
                        applyModel.ayStataType = applyStataType.applying;
                    }
                    else
                    {
                        applyModel.ayStataType = applyStataType.ok;
                    }
                    applyModel.managerID += "," +id ;
                    applyModel.managerName += "," + name;
                }
            }
            else
            {
                applyModel.ayStataType = applyStataType.no;
                if (string.IsNullOrEmpty(applyModel.managerID))
                {
                    applyModel.managerID = id + "";
                    applyModel.managerName = name + "";
                }
                else
                {
                    applyModel.managerID += "," + id;
                    applyModel.managerName += "," + name;
                }
            }
            applyModel.upDataBy = name;
            applyModel.upDataById = id;
            applyModel.upDataTime = DateTime.Now;
            //修改审批人，审批状态
            jm = await _applyModelServices.UpdateAsync(applyModel);
            //如果审批已经通过，执行修改。
            if (applyModel.ayStataType == applyStataType.ok)
            {
                if (applyModel.aType == applyType.points)
                {
                    FMUpdateUserPoint entityjifen = new FMUpdateUserPoint();
                    entityjifen.id = applyModel.userID;
                    int data;
                    int.TryParse(entity.data, out data);
                    entityjifen.point = data;
                    entityjifen.memo = applyModel.reMake;
                    jm = await _coreCmsUserServices.UpdatePiont(entityjifen);
                }
                else if (applyModel.aType == applyType.Balance)
                {
                    decimal data;
                    decimal.TryParse(entity.data, out data);

                    jm = await _coreCmsUserServices.UpdateBalance(applyModel.userID, data, applyModel.reMake);
                }
                else if (applyModel.aType == applyType.Referrer)
                {
                    int data;
                    int.TryParse(entity.data, out data);
                    var bl = await _coreCmsUserServices.UpdateAsync(p => new CoreCmsUser() { parentId = data }, p => p.id == applyModel.userID);
                }
            }
          if(jm.code == 0)
            {
                jm.msg = "审批成功";
            }

            return jm;
        }
        #endregion
@@ -361,13 +560,42 @@
            var jm = new AdminUiCallBack();

            var model = await _applyModelServices.QueryByIdAsync(entity.id, false);

         
            if (model == null)
            {
                jm.msg = "不存在此信息";
                return jm;
            }

            var modelDTO = new applyModelDTO();
            modelDTO.id = model.id;

            modelDTO.id = model.id;
            modelDTO.managerID = model.managerID;
            modelDTO.managerName = model.managerName;
            modelDTO.roleID = model.roleID;
            modelDTO.managerApplyCount = model.managerApplyCount;
            modelDTO.aType = (int)model.aType;
            modelDTO.aTypeName = model.aType.GetDescription();
            modelDTO.ayStataType = (int)model.ayStataType;
            modelDTO.ayStataTypeName = model.ayStataType.GetDescription();
            modelDTO.userID = model.userID;
            modelDTO.dec = model.dec;
            modelDTO.reMake = model.reMake;
            modelDTO.oldData = model.oldData;
            modelDTO.data = model.data;
            modelDTO.createById = model.createById;
            modelDTO.upDataById = model.upDataById;
            modelDTO.createTime = model.createTime;
            modelDTO.upDataTime = model.upDataTime;
            modelDTO.createBy = model.createBy;
            modelDTO.upDataBy = model.upDataBy;
            modelDTO.isdelete = model.isdelete;
            

            jm.code = 0;
            jm.data = model;
            jm.data = modelDTO;

            return jm;
        }

 CoreCms.Net.Web.Admin/wwwroot/views/applymodel/details.html

@@ -5,53 +5,53 @@
            <col>
        </colgroup>
        <tbody>
		    
            <tr>

            <!--<tr>
        <td>
            <label for="id">id</label>
        </td>
        <td>
            {{ d.params.data.id || '' }}
        </td>
    </tr>-->

            <tr>
                <td>
                    <label for="id">id</label>
                    <label for="managerName">审批人</label>
                </td>
                <td>
                    {{ d.params.data.id || '' }}
                    {{ d.params.data.managerName || '' }}
                </td>
            </tr>
		    
            <tr>

            <!--<tr>
        <td>
            <label for="roleID">审批角色ID</label>
        </td>
        <td>
            {{ d.params.data.roleID || '' }}
        </td>
    </tr>-->

            <tr>
                <td>
                    <label for="managerID">审批人ID</label>
                </td>
                <td>
                    {{ d.params.data.managerID || '' }}
                </td>
            </tr>
		    
            <tr>
                <td>
                    <label for="roleID">审批角色ID</label>
                </td>
                <td>
                    {{ d.params.data.roleID || '' }}
                </td>
            </tr>
		    
            <tr>
                <td>
                    <label for="managerApplyCount">审核人数数量</label>
                    <label for="managerApplyCount">审批人数量</label>
                </td>
                <td>
                    {{ d.params.data.managerApplyCount || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="aType">类型</label>
                    <label for="aTypeName">类型</label>
                </td>
                <td>
                    {{ d.params.data.aType || '' }}
                    {{ d.params.data.aTypeName || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="dec">内容</label>
                </td>
@@ -59,8 +59,8 @@
                    {{ d.params.data.dec || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="reMake">备注</label>
                </td>
@@ -68,8 +68,8 @@
                    {{ d.params.data.reMake || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="oldData">调整前数据</label>
                </td>
@@ -77,8 +77,8 @@
                    {{ d.params.data.oldData || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="data">调整数据</label>
                </td>
@@ -86,8 +86,8 @@
                    {{ d.params.data.data || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="createTime">建立时间</label>
                </td>
@@ -95,8 +95,8 @@
                    {{ d.params.data.createTime || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="upDataTime">修改时间</label>
                </td>
@@ -104,8 +104,8 @@
                    {{ d.params.data.upDataTime || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="createBy">创建人</label>
                </td>
@@ -113,8 +113,8 @@
                    {{ d.params.data.createBy || '' }}
                </td>
            </tr>
		    
            <tr>

            <tr>
                <td>
                    <label for="upDataBy">修改人</label>
                </td>
@@ -122,16 +122,24 @@
                    {{ d.params.data.upDataBy || '' }}
                </td>
            </tr>
		    
            <tr>
            <tr>
                <td>
                    <label for="isdelete">删除标志</label>
                    <label for="ayStataTypeName">审批状态</label>
                </td>
                <td>
                    <input type="checkbox" disabled name="isdelete" value="{{d.params.data.isdelete}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }}>
                    {{ d.params.data.ayStataTypeName || '' }}
                </td>
            </tr>
		    

            <!--<tr>
        <td>
            <label for="isdelete">删除标志</label>
        </td>
        <td>
            <input type="checkbox" disabled name="isdelete" value="{{d.params.data.isdelete}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }}>
        </td>
    </tr>-->

        </tbody>
    </table>
</script>

 CoreCms.Net.Web.Admin/wwwroot/views/applymodel/edit.html

@@ -1,106 +1,106 @@
<script type="text/html" template lay-done="layui.data.sendParams(d);">
    <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-applyModel-editForm" id="LAY-app-applyModel-editForm">
        <input type="hidden" name="id"  value="{{d.params.data.id || '' }}" />
        <div class="layui-form-item">
            <label for="id" class="layui-form-label  layui-form-required">id</label>
        <input type="hidden" name="id" value="{{d.params.data.id || '' }}" />
        <!--<div class="layui-form-item">
        <label for="id" class="layui-form-label  layui-form-required">id</label>
        <div class="layui-input-block">
            <input  type="number" min="0" max="999999" name="id"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.id || '' }}" placeholder="请输入id" lay-reqText="请输入id并为数字"  />
        </div>
    </div>-->
        <input type="hidden" name="roleID" value="{{d.params.data.roleID || '' }}" />
        <div class="layui-form-item">
            <label for="managerID" class="layui-form-label">审批人</label>
            <div class="layui-input-block">
                <input  type="number" min="0" max="999999" name="id"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.id || '' }}" placeholder="请输入id" lay-reqText="请输入id并为数字"  />
                <input name="managerID" lay-verType="tips" class="layui-input" readonly="readonly" value="{{d.params.data.managerName || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="managerID" class="layui-form-label  layui-form-required">审批人ID</label>
        <div class="layui-form-item">
            <label for="aType" class="layui-form-label">审批状态</label>
            <div class="layui-input-block">
                <input name="managerID"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入审批人ID" lay-reqText="请输入审批人ID"  value="{{d.params.data.managerID || '' }}" />
                <input name="ayStataTypeName" readonly="readonly" lay-verType="tips" class="layui-input" value="{{d.params.data.ayStataTypeName || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="roleID" class="layui-form-label  layui-form-required">审批角色ID</label>


        <div class="layui-form-item">
            <label for="managerApplyCount" class="layui-form-label">审核人数数量</label>
            <div class="layui-input-block">
                <input name="roleID"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入审批角色ID" lay-reqText="请输入审批角色ID"  value="{{d.params.data.roleID || '' }}" />
                <input type="number" min="0" max="999999" name="managerApplyCount" readonly="readonly" lay-verType="tips"  class="layui-input" value="{{d.params.data.managerApplyCount || '' }}"   />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="managerApplyCount" class="layui-form-label  layui-form-required">审核人数数量</label>

        <div class="layui-form-item">
            <label for="aType" class="layui-form-label">类型</label>
            <div class="layui-input-block">
                <input  type="number" min="0" max="999999" name="managerApplyCount"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.managerApplyCount || '' }}" placeholder="请输入审核人数数量" lay-reqText="请输入审核人数数量并为数字"  />
                <input name="aTypeName" readonly="readonly" lay-verType="tips" class="layui-input" value="{{d.params.data.aTypeName || '' }}"   />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="aType" class="layui-form-label  layui-form-required">类型</label>

        <div class="layui-form-item">
            <label for="dec" class="layui-form-label">内容</label>
            <div class="layui-input-block">
                <input  type="number" min="0" max="999999" name="aType"   lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.aType || '' }}" placeholder="请输入类型" lay-reqText="请输入类型并为数字"  />
                <input name="dec" lay-verType="tips"  readonly="readonly" class="layui-input"   value="{{d.params.data.dec || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="dec" class="layui-form-label  layui-form-required">内容</label>

        <div class="layui-form-item">
            <label for="reMake" class="layui-form-label">备注</label>
            <div class="layui-input-block">
                <input name="dec"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入内容" lay-reqText="请输入内容"  value="{{d.params.data.dec || '' }}" />
                <input name="reMake" lay-verType="tips"   class="layui-input" readonly="readonly"   value="{{d.params.data.reMake || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="reMake" class="layui-form-label  layui-form-required">备注</label>

        <div class="layui-form-item">
            <label for="oldData" class="layui-form-label">调整前数据</label>
            <div class="layui-input-block">
                <input name="reMake"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入备注" lay-reqText="请输入备注"  value="{{d.params.data.reMake || '' }}" />
                <input name="oldData" lay-verType="tips"   class="layui-input" readonly="readonly"  value="{{d.params.data.oldData || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="oldData" class="layui-form-label  layui-form-required">调整前数据</label>

        <div class="layui-form-item">
            <label for="data" class="layui-form-label">调整数据</label>
            <div class="layui-input-block">
                <input name="oldData"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入调整前数据" lay-reqText="请输入调整前数据"  value="{{d.params.data.oldData || '' }}" />
                <input name="data" lay-verType="tips"  class="layui-input" readonly="readonly"   value="{{d.params.data.data || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="data" class="layui-form-label  layui-form-required">调整数据</label>

        <div class="layui-form-item">
            <label for="createTime" class="layui-form-label">建立时间</label>
            <div class="layui-input-block">
                <input name="data"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入调整数据" lay-reqText="请输入调整数据"  value="{{d.params.data.data || '' }}" />
                <input name="createTime" id="createTime" type="text" readonly="readonly" lay-verType="tips" class="layui-input"   value="{{d.params.data.createTime || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="createTime" class="layui-form-label  layui-form-required">建立时间</label>

        <div class="layui-form-item">
            <label for="upDataTime" class="layui-form-label">修改时间</label>
            <div class="layui-input-block">
                <input name="createTime"  id="editTime-applyModel-createTime" type="text" lay-verType="tips" lay-verify="required|datetime" class="layui-input" placeholder="请输入建立时间" lay-reqText="请输入建立时间"   value="{{d.params.data.createTime || '' }}"/>
                <input name="upDataTime" id="upDataTime" type="text" readonly="readonly" lay-verType="tips" class="layui-input"  value="{{d.params.data.upDataTime || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="upDataTime" class="layui-form-label  layui-form-required">修改时间</label>

        <div class="layui-form-item">
            <label for="createBy" class="layui-form-label">创建人</label>
            <div class="layui-input-block">
                <input name="upDataTime"  id="editTime-applyModel-upDataTime" type="text" lay-verType="tips" lay-verify="required|datetime" class="layui-input" placeholder="请输入修改时间" lay-reqText="请输入修改时间"   value="{{d.params.data.upDataTime || '' }}"/>
                <input name="createBy" lay-verType="tips"   class="layui-input" readonly="readonly"   value="{{d.params.data.createBy || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="createBy" class="layui-form-label  layui-form-required">创建人</label>

        <div class="layui-form-item">
            <label for="upDataBy" class="layui-form-label">修改人</label>
            <div class="layui-input-block">
                <input name="createBy"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入创建人" lay-reqText="请输入创建人"  value="{{d.params.data.createBy || '' }}" />
                <input name="upDataBy" lay-verType="tips"  class="layui-input" readonly="readonly"   value="{{d.params.data.upDataBy || '' }}" />
            </div>
        </div>
	    
        <div class="layui-form-item">
            <label for="upDataBy" class="layui-form-label  layui-form-required">修改人</label>

        <div class="layui-form-item" pane>
            <label for="isdelete" class="layui-form-label  layui-form-required">同意拒绝</label>
            <div class="layui-input-block">
                <input name="upDataBy"   lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入修改人" lay-reqText="请输入修改人"  value="{{d.params.data.upDataBy || '' }}" />
                <input type="checkbox" lay-filter="switch" name="isdelete" {{ d.params.data.isdelete ? 'checked' : '' }} lay-skin="switch" lay-text="同意|拒绝">
            </div>
        </div>
	    
        <div class="layui-form-item" pane>
            <label for="isdelete" class="layui-form-label  layui-form-required">删除标志</label>
            <div class="layui-input-block">
                <input type="checkbox" lay-filter="switch" name="isdelete"   {{ d.params.data.isdelete ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
            </div>
        </div>
	    

        <div class="layui-form-item text-right core-hidden">
            <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-applyModel-editForm-submit" id="LAY-app-applyModel-editForm-submit" value="确认编辑">
            <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-applyModel-editForm-submit" id="LAY-app-applyModel-editForm-submit" value="确认审批">
        </div>
    </div>
</script>

 CoreCms.Net.Web.Admin/wwwroot/views/applymodel/index.html

@@ -118,8 +118,8 @@

<script type="text/html" id="LAY-app-applyModel-pagebar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>添加数据</button>
        <button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
        <!--<button class="layui-btn layui-btn-sm" lay-event="addData"><i class="layui-icon layui-icon-add-1"></i>添加数据</button>-->
        <!--<button class="layui-btn layui-btn-sm" lay-event="batchDelete"><i class="layui-icon layui-icon-delete"></i>批量删除</button>-->
        <button class="layui-btn layui-btn-sm" lay-event="selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>选择导出</button>
        <button class="layui-btn layui-btn-sm" lay-event="queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>查询导出</button>
    </div>
@@ -127,8 +127,8 @@

<script type="text/html" id="LAY-app-applyModel-tableBox-bar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#applyModelTbDelDrop{{d.LAY_INDEX}}" no-shade="true">删除</a>
    <a class="layui-btn layui-btn-xs" lay-event="edit">审批</a>
    <!--<a class="layui-btn layui-btn-danger layui-btn-xs" data-dropdown="#applyModelTbDelDrop{{d.LAY_INDEX}}" no-shade="true">删除</a>-->
    <div class="dropdown-menu-nav dropdown-popconfirm dropdown-top-right layui-hide" id="applyModelTbDelDrop{{d.LAY_INDEX}}"
         style="max-width: 200px;white-space: normal;min-width: auto;margin-left: 10px;">
        <div class="dropdown-anchor"></div>

 CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editBalance.html

@@ -5,7 +5,10 @@
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">当前余额：</label>
                <div class="layui-form-mid">{{d.params.data.balance}}</div>
                <!--<div class="layui-form-mid">{{d.params.data.balance}}</div>-->
                <div class="layui-input-inline layui-inline-3">
                    <input type="text" name="oldbalance" id="oldbalance" readonly="readonly" class="layui-input" value="{{d.params.data.balance}}"   lay-verify="required|verifybalance">
                </div>
            </div>
        </div>
        <div class="layui-form-item">

 CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editParentId.html

@@ -5,7 +5,10 @@
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">当前上级：</label>
                <div class="layui-form-mid">{{d.params.data.model.parentId}}</div>
                <!--<div class="layui-form-mid">{{d.params.data.model.parentId}}</div>-->
                <div class="layui-input-inline layui-inline-3">
                    <input type="number" name="oldparentId" id="oldparentId"  readonly="readonly" class="layui-input" value="{{d.params.data.model.parentId}}" lay-verify="required|number">
                </div>
                <div class="layui-form-mid">
                    当前用户上级的序列号
                </div>

 CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/editPoint.html

@@ -5,7 +5,10 @@
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">当前积分：</label>
                <div class="layui-form-mid">{{d.params.data.point}}</div>
                <!--<div class="layui-form-mid">{{d.params.data.point}}</div>-->
                <div class="layui-input-inline layui-inline-3">
                    <input type="text" name="oldpoint" id="oldpoint" readonly="readonly" class="layui-input" value="{{d.params.data.point}}"  lay-verify="required|number">
                </div>
            </div>
        </div>
        <div class="layui-form-item">