Merge branch '金隅分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -26,6 +26,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
 
         private UserIBLL userIbll = new UserBLL();
         private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
+        private StudentLeaveIBLL studentLeaveIBLL = new StudentLeaveBLL();
 
         #region 视图功能
         /// <summary>
@@ -278,6 +279,25 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 普通教师请假归档
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult LeaveFiling()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 普通教师请假流程监控
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult LeaveFilingMonitor()
+        {
+            return View();
+        }
+
         #endregion
 
 
@@ -342,6 +362,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             };
             return Success(jsonData);
         }
+        
         /// <summary>
         /// 获取我的流程信息列表
         /// </summary>
@@ -415,6 +436,28 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             var data = nWFTaskIBLL.GetEntity(taskId);
             return Success(data);
         }
+
+        /// <summary>
+        /// 获取普通教师请假归档列表
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetLeaveList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var list = studentLeaveIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = list,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records,
+            };
+            return Success(jsonData);
+        }
         #endregion
 
         #region 保存更新删除

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.cshtml

@@ -0,0 +1,57 @@
+@{
+    ViewBag.Title = "普通教师请假归档";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <div id="F_CreateUserName"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">所属部门</div>
+                                    <div id="F_BuMen"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">请假类型</div>
+                                    <div id="F_QJType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">请假事由</div>
+                                    <input id="F_Description" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_eye" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlg">查看</span></a>
+                    </div>
+                </div>
+            </div>
+
+            <div class="lr-layout-body" id="gridtable">
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js")
+
+
+
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/LeaveFiling.js

@@ -0,0 +1,191 @@
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2018 上海力软信息技术有限公司
+ * 创建人：力软-前端开发组
+ * 日 期：2021.05.18
+ * 描 述：普通教师请假归档
+ */
+var bootstrap = function ($, learun) {
+    "use strict";
+    var categoryId = '1';
+    var logbegin = '';
+    var logend = '';
+
+    var page = {
+        init: function () {
+            $('#lr_verify').hide();
+            page.initGrid();
+            page.bind();
+        },
+        bind: function () {
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                selectfn: function (begin, end) {
+                    logbegin = begin;
+                    logend = end;
+                    page.search();
+                }
+            });
+            // 查询
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#F_CreateUserName').lrUserSelect(1);
+            $('#F_QJType').lrDataItemSelect({ code: 'LeaveType' });
+            $('#F_BuMen').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_eye').on('click', function () {
+                page.eye();
+            });
+        },
+        initleft: function () {
+            $('#lr_left_list li').on('click', function () {
+                var $this = $(this);
+                var $parent = $this.parent();
+                $parent.find('.active').removeClass('active');
+                $this.addClass('active');
+                categoryId = $this.attr('data-value');
+                if (categoryId == 3) {
+                    categoryId = 1;
+                    F_EnabledMark = true;
+                } else {
+                    F_EnabledMark = false;
+                }
+                page.search();
+            });
+        },
+        initGrid: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetLeaveList',
+                headData: [
+                    {
+                        label: '开始时间', name: 'StartDate', width: 140, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: '上下午', name: 'F_shangxiawu', width: 60, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'sxw',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '结束时间', name: 'EndDate', width: 140, align: "left", formatter: function (cellvalue, row) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: '上下午', name: 'F_sxw', width: 60, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'sxw',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '姓名', name: 'F_CreateUserName', width: 80, align: "left",
+                        formatterAsync: function (callback, value, row) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (item) {
+                                    callback(item.name);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '所属部门', name: 'F_BuMen', width: 120, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '请假天数', name: 'F_tianshu', width: 60, align: "left" },
+                    {
+                        label: '请假类型', name: 'F_QJType', width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'LeaveType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '请假事由', name: 'F_Description', width: 80, align: "left" },
+                ],
+                mainId: 'SLId',
+                isPage: true,
+                sidx: 'F_CreateDate DESC',
+                dblclick: function () {
+                    page.eye();
+                }
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = logbegin;
+            param.EndTime = logend;
+            param.F_IsFinished = 1;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        eye: function () {
+            var processId = $('#gridtable').jfGridValue('SLId') || '';
+            var title = $('#gridtable').jfGridValue('F_Description');
+
+            if (learun.checkrow(processId)) {
+                learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
+            }
+        }
+    };
+
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/Emp_PayrollOnceController.cs

@@ -105,8 +105,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             {
                 IssueYear = x.Key.IssueYear,
                 IssueMonth = x.Key.IssueMonth,
-                SpringFestival = x.Select(y => y.SpringFestival.ToDecimal()).Sum().ToString(),
-                MidAutumnFestival = x.Select(y => y.MidAutumnFestival.ToDecimal()).Sum().ToString()
+                TotalPayAmount = x.Select(y => y.TotalPayAmount.ToDecimal()).Sum().ToString(),
+                FinalPayAmount = x.Select(y => y.FinalPayAmount.ToDecimal()).Sum().ToString()
             }).OrderByDescending(x => x.IssueYear).ThenByDescending(x => x.IssueMonth);
 
             return Success(datagroup);
@@ -140,9 +140,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             EMP_PayrollOnceEntity entity = strEntity.ToObject<EMP_PayrollOnceEntity>();
             emp_PayrollOnceIBLL.SaveEntity(keyValue, entity);
-            if (string.IsNullOrEmpty(keyValue))
-            {
-            }
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml

@@ -16,12 +16,16 @@
         <input id="IssueYear" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
-        <div class="lr-form-item-title">春节福利</div>
-        <input id="SpringFestival" type="text" class="form-control" />
+        <div class="lr-form-item-title">应发金额</div>
+        <input id="TotalPayAmount" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
-        <div class="lr-form-item-title">中秋节福利</div>
-        <input id="MidAutumnFestival" type="text" class="form-control" />
+        <div class="lr-form-item-title">实发金额</div>
+        <input id="FinalPayAmount" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EMP_PayrollOnce">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:50px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js

@@ -91,13 +91,15 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetPageList',
                 headData: [
                     { label: "姓名", name: "SalaryName", width: 100, align: "left" },
-                    { label: "春节福利", name: "SpringFestival", width: 100, align: "left", statistics: true },
-                    { label: "中秋节福利", name: "MidAutumnFestival", width: 100, align: "left", statistics: true },
+                    { label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
+                    { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
                     { label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
                     { label: "发放年份", name: "IssueYear", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'SalaryID',
-                isPage: true
+                isPage: true,
+                sidx: 'IssueYear desc,IssueMonth desc'
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/StatisticIndex.js

@@ -47,8 +47,8 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "发放年份", name: "IssueYear", width: 100, align: "left" },
                     { label: "发放月份", name: "IssueMonth", width: 100, align: "left" },
-                    { label: "春节福利", name: "SpringFestival", width: 100, align: "left", statistics: true },
-                    { label: "中秋节福利", name: "MidAutumnFestival", width: 100, align: "left", statistics: true },
+                    { label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
+                    { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
                 ],
                 mainId: 'SalaryID',
                 isPage: false

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1286,6 +1286,7 @@
     <Content Include="Areas\LR_LGManager\Views\StampApply\Form.js" />
     <Content Include="Areas\LR_LGManager\Views\StampApply\Index.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\AddTaskForm.js" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\LeaveFiling.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFilingMonitor.js" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\htPrint.css" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ContractFiling.js" />
@@ -7183,6 +7184,7 @@
     <Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\Emp_PayrollOnce\StatisticIndex.cshtml" />
+    <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\LeaveFiling.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_LGManager/StudentLeaveMap.cs

@@ -0,0 +1,28 @@
+using Learun.Application.TwoDevelopment.LR_LGManager;
+using System.Data.Entity.ModelConfiguration;
+
+namespace Learun.Application.Mapping
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-05-18 15:48 
+    /// 描 述：流程_请假表 
+    /// </summary> 
+    public class StudentLeaveMap : EntityTypeConfiguration<StudentLeaveEntity>
+    {
+        public StudentLeaveMap()
+        {
+            #region 表、主键 
+            //表 
+            this.ToTable("STUDENTLEAVE");
+            //主键 
+            this.HasKey(t => t.SLId);
+            #endregion
+
+            #region 配置关系 
+            #endregion
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -138,6 +138,7 @@
     <Compile Include="LR_IM\IMSysUserMap.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialApplyMap.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItemMap.cs" />
+    <Compile Include="LR_LGManager\StudentLeaveMap.cs" />
     <Compile Include="LR_LGManager\LC_hetongMap.cs" />
     <Compile Include="LR_LGManager\StampApplyMap.cs" />
     <Compile Include="LR_Message\LR_MS_StrategyInfoMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveBLL.cs

@@ -0,0 +1,148 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_LGManager
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-05-18 15:48 
+    /// 描 述：流程_请假表 
+    /// </summary> 
+    public class StudentLeaveBLL : StudentLeaveIBLL
+    {
+        private StudentLeaveService studentLeaveService = new StudentLeaveService();
+
+        #region 获取数据 
+
+        /// <summary> 
+        /// 获取列表数据 
+        /// </summary> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        public IEnumerable<StudentLeaveEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return studentLeaveService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// 获取列表分页数据 
+        /// </summary> 
+        /// <param name="pagination">分页参数</param> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        public IEnumerable<StudentLeaveEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return studentLeaveService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// 获取实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <returns></returns> 
+        public StudentLeaveEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return studentLeaveService.GetEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据 
+
+        /// <summary> 
+        /// 删除实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                studentLeaveService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <param name="entity">实体</param> 
+        public void SaveEntity(string keyValue, StudentLeaveEntity entity)
+        {
+            try
+            {
+                studentLeaveService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveEntity.cs

@@ -0,0 +1,131 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.LR_LGManager
+
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-05-18 15:48 
+    /// 描 述：流程_请假表 
+    /// </summary> 
+    public class StudentLeaveEntity
+    {
+        #region 实体成员 
+        /// <summary> 
+        /// SLId 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("SLID")]
+        public string SLId { get; set; }
+        /// <summary> 
+        /// 创建人ID 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_CREATEUSERID")]
+        public string F_CreateUserId { get; set; }
+        /// <summary> 
+        /// 创建人 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_CREATEUSERNAME")]
+        public string F_CreateUserName { get; set; }
+        /// <summary> 
+        /// 创建时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_CREATEDATE")]
+        public DateTime? F_CreateDate { get; set; }
+        /// <summary> 
+        /// 备注 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_DESCRIPTION")]
+        public string F_Description { get; set; }
+        /// <summary> 
+        /// 开始时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("STARTDATE")]
+        public DateTime? StartDate { get; set; }
+        /// <summary> 
+        /// 结束时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("ENDDATE")]
+        public DateTime? EndDate { get; set; }
+        /// <summary> 
+        /// 请假类型 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_QJTYPE")]
+        public string F_QJType { get; set; }
+        /// <summary> 
+        /// 所属部门 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_BUMEN")]
+        public string F_BuMen { get; set; }
+        /// <summary> 
+        /// 请假天数 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_TIANSHU")]
+        public string F_tianshu { get; set; }
+        /// <summary> 
+        /// 资料上传 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_FUJIAN")]
+        public string F_fujian { get; set; }
+        /// <summary> 
+        /// 上下午（开始时间）
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_SHANGXIAWU")]
+        public string F_shangxiawu { get; set; }
+        /// <summary> 
+        /// 上下午（结束时间）
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_SXW")]
+        public string F_sxw { get; set; }
+        /// <summary> 
+        /// 当前角色 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("F_DQJS")]
+        public string F_dqjs { get; set; }
+        /// <summary> 
+        /// LeaveDay 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("LEAVEDAY")]
+        public string LeaveDay { get; set; }
+        #endregion
+
+        #region 扩展操作 
+        /// <summary> 
+        /// 新增调用 
+        /// </summary> 
+        public void Create()
+        {
+            this.SLId = Guid.NewGuid().ToString();
+            this.F_CreateDate = DateTime.Now;
+            UserInfo userInfo = LoginUserInfo.Get();
+            this.F_CreateUserId = userInfo.userId;
+            this.F_CreateUserName = userInfo.realName;
+        }
+        /// <summary> 
+        /// 编辑调用 
+        /// </summary> 
+        /// <param name="keyValue"></param> 
+        public void Modify(string keyValue)
+        {
+            this.SLId = keyValue;
+        }
+        #endregion
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveIBLL.cs

@@ -0,0 +1,55 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_LGManager
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-05-18 15:48 
+    /// 描 述：流程_请假表 
+    /// </summary> 
+    public interface StudentLeaveIBLL
+    {
+        #region 获取数据 
+
+        /// <summary> 
+        /// 获取列表数据 
+        /// </summary> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        IEnumerable<StudentLeaveEntity> GetList(string queryJson);
+        /// <summary> 
+        /// 获取列表分页数据 
+        /// </summary> 
+        /// <param name="pagination">分页参数</param> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        IEnumerable<StudentLeaveEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary> 
+        /// 获取实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <returns></returns> 
+        StudentLeaveEntity GetEntity(string keyValue);
+        #endregion
+
+        #region 提交数据 
+
+        /// <summary> 
+        /// 删除实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        void DeleteEntity(string keyValue);
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <param name="entity">实体</param> 
+        void SaveEntity(string keyValue, StudentLeaveEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_LGManager/StudentLeave/StudentLeaveService.cs

@@ -0,0 +1,238 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.LR_LGManager
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-05-18 15:48 
+    /// 描 述：流程_请假表 
+    /// </summary> 
+    public class StudentLeaveService : RepositoryFactory
+    {
+        #region 构造函数和属性 
+
+        private string fieldSql;
+        /// <summary> 
+        /// 构造方法 
+        /// </summary> 
+        public StudentLeaveService()
+        {
+            fieldSql = @" 
+                t.SLId, 
+                t.F_CreateUserId, 
+                t.F_CreateUserName, 
+                t.F_CreateDate, 
+                t.F_Description, 
+                t.StartDate, 
+                t.EndDate, 
+                t.F_QJType, 
+                t.F_BuMen, 
+                t.F_tianshu, 
+                t.F_fujian, 
+                t.F_shangxiawu, 
+                t.F_sxw, 
+                t.F_dqjs, 
+                t.LeaveDay 
+            ";
+        }
+        #endregion
+
+        #region 获取数据 
+
+        /// <summary> 
+        /// 获取列表数据 
+        /// </summary> 
+        /// <param name="queryJson">条件参数</param> 
+        /// <returns></returns> 
+        public IEnumerable<StudentLeaveEntity> GetList(string queryJson)
+        {
+            try
+            {
+                //参考写法 
+                //var queryParam = queryJson.ToJObject(); 
+                // 虚拟参数 
+                //var dp = new DynamicParameters(new { }); 
+                //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); 
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM StudentLeave t ");
+                return this.BaseRepository().FindList<StudentLeaveEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// 获取列表分页数据 
+        /// </summary> 
+        /// <param name="pagination">分页参数</param> 
+        /// <param name="queryJson">条件参数</param> 
+        /// <returns></returns> 
+        public IEnumerable<StudentLeaveEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append(" FROM StudentLeave t left join LR_NWF_Process p on t.SLId=p.F_Id where p.F_EnabledMark!=2 and p.F_IsChild=0 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_IsFinished"].IsEmpty())
+                {
+                    dp.Add("F_IsFinished", queryParam["F_IsFinished"].ToString(), DbType.String);
+                    strSql.Append(" and p.F_IsFinished=@F_IsFinished ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.F_CreateDate >= @startTime AND t.F_CreateDate <= @endTime ) ");
+                }
+                if (!queryParam["F_CreateUserName"].IsEmpty())
+                {
+                    var arr = queryParam["F_CreateUserName"].ToString().Split(',');
+                    var arrtemp = "";
+                    foreach (var item in arr)
+                    {
+                        arrtemp += $"'{item}',";
+                    }
+                    arrtemp = arrtemp.TrimEnd(',');
+                    strSql.Append($" and t.F_CreateUserName in ({arrtemp}) ");
+                }
+                if (!queryParam["F_BuMen"].IsEmpty())
+                {
+                    dp.Add("F_BuMen", queryParam["F_BuMen"].ToString(), DbType.String);
+                    strSql.Append(" and t.F_BuMen=@F_BuMen ");
+                }
+                if (!queryParam["F_QJType"].IsEmpty())
+                {
+                    dp.Add("F_QJType", queryParam["F_QJType"].ToString(), DbType.String);
+                    strSql.Append(" and t.F_QJType=@F_QJType ");
+                }
+                if (!queryParam["F_Description"].IsEmpty())
+                {
+                    dp.Add("F_Description", "%" + queryParam["F_Description"].ToString() + "%", DbType.String);
+                    strSql.Append(" and t.F_Description like @F_Description ");
+                }
+                return this.BaseRepository().FindList<StudentLeaveEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// 获取实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        /// <returns></returns> 
+        public StudentLeaveEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<StudentLeaveEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据 
+
+        /// <summary> 
+        /// 删除实体数据 
+        /// </summary> 
+        /// <param name="keyValue">主键</param> 
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository().Delete<StudentLeaveEntity>(t => t.SLId == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+        /// 保存实体数据（新增、修改） 
+        /// <param name="keyValue">主键</param> 
+        /// <param name="entity">实体</param> 
+        /// </summary> 
+        public void SaveEntity(string keyValue, StudentLeaveEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository().Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository().Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -273,6 +273,10 @@
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemEntity.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemIBLL.cs" />
     <Compile Include="LR_LGManager\CorporateMaterialItem\CorporateMaterialItemService.cs" />
+    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveBLL.cs" />
+    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveEntity.cs" />
+    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveIBLL.cs" />
+    <Compile Include="LR_LGManager\StudentLeave\StudentLeaveService.cs" />
     <Compile Include="LR_LGManager\LC_hetong\LC_hetongBLL.cs" />
     <Compile Include="LR_LGManager\LC_hetong\LC_hetongEntity.cs" />
     <Compile Include="LR_LGManager\LC_hetong\LC_hetongIBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs

@@ -16,35 +16,40 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
     {
         #region 实体成员
         /// <summary>
-        /// SalaryID
+        /// 工资编号
         /// </summary>
         [Column("SALARYID")]
         public string SalaryID { get; set; }
         /// <summary>
-        /// SalaryName
+        /// 姓名
         /// </summary>
         [Column("SALARYNAME")]
         public string SalaryName { get; set; }
         /// <summary>
-        /// IssueMonth
+        /// 发放月份
         /// </summary>
         [Column("ISSUEMONTH")]
         public string IssueMonth { get; set; }
         /// <summary>
-        /// IssueYear
+        /// 发放年份
         /// </summary>
         [Column("ISSUEYEAR")]
         public string IssueYear { get; set; }
         /// <summary>
-        /// SpringFestival
+        /// 应发金额
         /// </summary>
-        [Column("SPRINGFESTIVAL")]
-        public string SpringFestival { get; set; }
+        [Column("TOTALPAYAMOUNT")]
+        public string TotalPayAmount { get; set; }
         /// <summary>
-        /// MidAutumnFestival
+        /// 实发金额
         /// </summary>
-        [Column("MIDAUTUMNFESTIVAL")]
-        public string MidAutumnFestival { get; set; }
+        [Column("FINALPAYAMOUNT")]
+        public string FinalPayAmount { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
 
         #endregion