Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookOutController.cs

@@ -46,7 +46,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult FormOut()
         {
-            ViewBag.BookCode = "RK" + DateTime.Now.ToString("yyyyMMddHHmmss");
+            ViewBag.BookCode = "CK" + DateTime.Now.ToString("yyyyMMddHHmmss");
             return View();
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextbookInOutController.cs

@@ -2,6 +2,7 @@
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 using Learun.Util;
 using System.Data;
+using System.Linq;
 using System.Web.Mvc;
 
 namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
@@ -38,6 +39,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             ViewBag.BookCode = "KC" + DateTime.Now.ToString("yyyyMMddHHmmss");
             return View();
         }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormUse()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexInOut()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -91,6 +110,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormUseData(string keyValue)
+        {
+            var TextBookInOutData = textbookInOutIBLL.GetEntity(keyValue);
+            var TextBookInOutDetailData = textbookInOutIBLL.GetInOrOutEntity(TextBookInOutData.BookCode).OrderBy(x => x.CreateTime);
+            var jsonData = new
+            {
+                TextBookInOut = TextBookInOutData,
+                TextBookInOrOut = TextBookInOutDetailData,
+            };
+            return Success(jsonData);
+        }
         #endregion
 
         #region 提交数据
@@ -124,7 +162,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             {
                 entity.IsDel = 0;
                 entity.IsSubmit = 0;
-                entity.FinallyNum = 0;
                 entity.CreateTime = DateTime.Now;
                 entity.CrateUserID = loginUserInfo.userId;
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIn/FormDelete.js

@@ -50,8 +50,9 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认删除该项！', function (res, index) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/TextBookIn/DeleteForm', { keyValue: NewkeyValue }, function () {
-                                refreshGirdData();
-                                learun.layerClose(window.name);
+                                var index = top.layer.getFrameIndex(window.name);
+                                console.log('index', index);
+                                top.layer.close(index);
                             });
                         }
                     });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookOut/Form.js

@@ -50,6 +50,7 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                             $('#TextBookOut').jfGridSet('refreshdata', tempdatra);
+                            learun.layerClose(window.name);
                             top.layer.close(index);
                         }
                     });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookOut/FormDelete.js

@@ -101,8 +101,9 @@ var bootstrap = function ($, learun) {
                     learun.layerConfirm('是否确认删除该项！', function (res, index) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/TextBookOut/DeleteForm', { keyValue: NewkeyValue }, function () {
-                                refreshGirdData();
-                                learun.layerClose(window.name);
+                                var index = top.layer.getFrameIndex(window.name);
+                                console.log('index', index);
+                                top.layer.close(index);
                             });
                         }
                     });
@@ -112,7 +113,7 @@ var bootstrap = function ($, learun) {
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TextBookOut/GetFormData?keyValue=' + keyValue, function (data) {
-                    for(var id in data) {
+                    for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
                             $('#' + id).jfGridSet('refreshdata', data[id]);
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/FormUse.cshtml

@@ -0,0 +1,51 @@
+@{
+    ViewBag.Title = "教材库存表";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">库存单</div>
+        <input id="BookCode" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">课程</div>
+        <div id="LessonNo" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">所选书籍</div>
+        <input id="TextBookName" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">出版号</div>
+        <input id="PublishNo" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">作者</div>
+        <input id="FirstAuthor" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">其他作者</div>
+        <input id="OtherAuthor" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">出版社</div>
+        <input id="Publisher" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">版次</div>
+        <input id="Edition" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">当前库存</div>
+        <input id="FinallyNum" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookInOut">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height: 100px;" readonly></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="TextBookInOrOut"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookInOut/FormUse.js")
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/FormUse.js

@@ -0,0 +1,97 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-03-02 10:37
+ * 描  述：教材库存表
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var selectedRow;
+var refreshGirdData;
+var tempdatra = new Array();
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            $('#TextBookInOrOut').jfGrid({
+                headData: [
+                    { label: '出/入库', name: 'CKORRK', width: 180, align: 'left' },
+                    { label: '库存单', name: 'InorOut', width: 180, align: 'left' },
+                    { label: '出库单', name: 'BookCode', width: 180, align: 'left' },
+                    { label: '出/入库数量', name: 'variate', width: 100, align: 'left' },
+                    { label: '出库时间', name: 'CreateTime', width: 200, align: 'left' },
+                    { label: '出库用户', name: 'CrateUserID', width: 100, align: 'left' },
+                    { label: '备注', name: 'Remark', width: 100, align: 'left' },
+                ],
+                height: 400,
+                mainId: 'CreateTime desc',
+                reloadSelected: false,
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TextBookInOut/GetFormUseData?keyValue=' + keyValue, function (data) {
+                    console.log(data,123123)
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                            tempdatra = data[id];
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    refreshGirdData = function (temprow) {
+        var ifnewrow = true;
+        $.each(tempdatra, function (key, val) {
+            if (tempdatra[key].ID === temprow.ID) {
+                tempdatra[key] = temprow;
+                ifnewrow = false;
+            }
+        });
+        if (ifnewrow) {
+            tempdatra.push(temprow);
+        }
+
+        $('#TextBookInOrOut').jfGridSet('refreshdata', tempdatra);
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TextBookOut/GetFormData?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'TextBookInOrOut' && data[id]) {
+                            keyValue = data[id].ID;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexInOut.cshtml

@@ -0,0 +1,30 @@
+@{
+    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">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </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_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;明细查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookInOut/IndexInOut.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextbookInOut/IndexInOut.js

@@ -0,0 +1,92 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-03-02 10:37
+ * 描  述：教材库存表
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formview',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/TextBookInOut/FormUse?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 700,
+                        btn: null,
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/TextBookInOut/GetPageList',
+                headData: [
+                    { label: '库存单号', name: 'BookCode', width: 200, align: "left" },
+                    {
+                        label: "课程", name: "LessonNo", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                                key: value,
+                                keyId: 'lessonno',
+                                callback: function (_data) {
+                                    callback(_data['lessonname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '教材名称', name: 'TextBookName', width: 200, align: "left" },
+                    { label: '教材号', name: 'TextBookNo', width: 200, align: "left" },
+                    { label: '出版号', name: 'PublishNo', width: 200, align: "left" },
+                    { label: '第一作者', name: 'FirstAuthor', width: 200, align: "left" },
+                    { label: '其他作者', name: 'OtherAuthor', width: 200, align: "left" },
+                    //{ label: '出版日期', name: 'Pubdate', width: 200, align: "left" },
+                    { label: '出版社', name: 'Publisher', width: 200, align: "left" },
+                    { label: '版次', name: 'Edition', width: 200, align: "left" },
+                    { label: '印次', name: 'Impression', width: 200, align: "left" },
+                    { label: '创建人', name: 'CreateTime', width: 200, align: "left" },
+                    { label: '创建用户', name: 'CrateUserID', width: 200, align: "left" },
+                    { label: '修改人', name: 'UpTime', width: 200, align: "left" },
+                    { label: '修改用户', name: 'UpUserID', width: 200, align: "left" },
+                    { label: '当前数量', name: 'FinallyNum', width: 200, align: "left" },
+                    { label: '备注', name: 'Remark', width: 200, align: "left" },
+
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = 'and IsDel = 0 ';
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/ResourceFileController.cs

@@ -83,6 +83,15 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 云盘文件统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FileStatistic()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据
@@ -204,6 +213,42 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
             var data = fileInfoBLL.GetEntity(keyValue);
             return JsonResult(data);
         }
+        /// <summary>
+        /// 获取云盘文件统计数据
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public ActionResult GetFileStatisitcData(string queryJson)
+        {
+            var data = fileInfoBLL.GetListByJson(queryJson);
+            var dataGroup = data.Where(x => x.F_CreateDate.HasValue).GroupBy(x => x.F_CreateDate.Value.Month).Select(x => new TempClass()
+            {
+                month=x.Key,
+                count = x.Select(y=>y.F_FileId).Count()
+            });
+
+            var xAxis = new List<string>();
+            var seriesData = new List<int>();
+            for (int i = 0; i < 12; i++)
+            {
+                xAxis.Add(string.Format("{0}月", i + 1));
+                var aa = dataGroup.FirstOrDefault(x => x.month == (i + 1));
+                seriesData.Add(aa == null ? 0 : aa.count);
+            }
+
+            var jsonData = new
+            {
+                seriesData = seriesData,
+                xAxis = xAxis
+            };
+
+            return Success(jsonData);
+        }
+        public class TempClass {
+            public int month { get; set; }
+            public int count { get; set; }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/FileStatistic.cshtml

@@ -0,0 +1,37 @@
+
+@{
+    ViewBag.Title = "流程使用报表";
+    Layout = "~/Views/Shared/_ReportTemplate.cshtml";
+}
+
+<div class="lr-layout ui-report">
+    <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">
+                        <input id="year" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy',onpicked: function () { $('#year').trigger('change'); }  })" placeholder="请选择年" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlt">查询</span></a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class="btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr-replace" class="btn btn-default"><i class="fa fa-refresh"></i>&nbsp;<span class="lrlt">刷新</span></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-grid" style="overflow:auto;">
+                <div class="grid-title">
+                    <div style="overflow: hidden; padding-bottom: 20px; text-align: center; margin-left: auto; margin-right: auto;">
+                        <div id="main" style="width: 650px; height: 350px;border: 1px solid #ccc;">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="~/Content/echarts/echarts.js"></script>
+@Html.AppendJsFile("/Areas/LR_OAModule/Views/ResourceFile/FileStatistic.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/FileStatistic.js

@@ -0,0 +1,79 @@
+var bootstrap = function ($, learun) {
+    "use strict";
+    var year = "";
+    var page = {
+        init: function () {
+            page.bind();
+            page.initChart();
+        },
+        bind: function () {
+            //当前年
+            var now = learun.formatDate(new Date(), 'yyyy');
+            $('#year').val(now);
+            year = now;
+            // 刷新
+            $('#lr-replace').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                year = $('#year').val();
+                page.search();
+            });
+        },
+        initChart: function () {
+            var myChart1 = echarts.init(document.getElementById('main'));
+            var queryJson = { year: year };
+            learun.httpAsyncPost(top.$.rootUrl + "/LR_OAModule/ResourceFile/GetFileStatisitcData", { queryJson: JSON.stringify(queryJson) }, function (res) {
+                if (res.code == 200) {
+                    var option1 = {
+                        title: {
+                            text: year + '年云盘文件统计图',
+                            x: 'center'
+                        },
+                        legend: {
+                            orient: 'vertical',
+                            left: 'left',
+                            data: ['数量']
+                        },
+                        tooltip: {
+                            trigger: 'axis'
+                        },
+                        grid: {
+                            left: '5%',
+                            right: '3%',
+                            bottom: '3%',
+                            containLabel: true
+                        },
+                        xAxis: {
+                            type: 'category',
+                            data: res.data.xAxis
+                        },
+                        yAxis: {
+                            type: 'value',
+                            name: '文件数/个'
+
+                        },
+                        series: [
+                            {
+                                name: '数量',
+                                type: 'bar',
+                                data: res.data.seriesData
+                            }
+                        ]
+                    };
+                    myChart1.setOption(option1);
+                }
+            });
+
+        },
+        search: function (param) {
+            param = param || {};
+            param.year = year;
+            page.initChart();
+        }
+    };
+    page.init();
+}
+
+

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

@@ -1179,6 +1179,8 @@
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormLook.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormDetail.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIndent\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\FormUse.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\IndexInOut.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormDelete.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIn\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookIn\Form.js" />
@@ -1490,6 +1492,7 @@
     <Content Include="Areas\LR_OAModule\Views\Notice\IndexRecycle.js" />
     <Content Include="Areas\LR_OAModule\Views\Notice\IndexFlow.js" />
     <Content Include="Areas\LR_OAModule\Views\ResourceFile\BcIndex.js" />
+    <Content Include="Areas\LR_OAModule\Views\ResourceFile\FileStatistic.js" />
     <Content Include="Areas\LR_OAModule\Views\Signet\Index.js" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Form.css" />
     <Content Include="Areas\LR_PortalSite\Views\Article\Form.js" />
@@ -7628,6 +7631,9 @@
     <Content Include="Areas\EducationalAdministration\Views\TextBookOut\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormView.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\TextBookOut\FormDelete.cshtml" />
+    <Content Include="Areas\LR_OAModule\Views\ResourceFile\FileStatistic.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\FormUse.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TextBookInOut\IndexInOut.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FileInfo/FileInfoBLL.cs

@@ -33,6 +33,10 @@ namespace Learun.Application.OA.File.FileInfo
         {
             return service.GetList();
         }
+        public IEnumerable<FileInfoEntity> GetListByJson(string queryJson)
+        {
+            return service.GetListByJson(queryJson);
+        }
         /// <summary>
         /// 文档列表
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FileInfo/FileInfoIBLL.cs

@@ -22,6 +22,7 @@ namespace Learun.Application.OA.File.FileInfo
 
         IEnumerable<FileInfoEntity> GetList(string userId);
         IEnumerable<FileInfoEntity> GetList();
+        IEnumerable<FileInfoEntity> GetListByJson(string queryJson);
         /// <summary>
         /// 文档列表
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FileInfo/FileInfoService.cs

@@ -1,4 +1,5 @@
 using Learun.DataBase.Repository;
+using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
@@ -24,7 +25,25 @@ namespace Learun.Application.OA.File.FileInfo
         public IEnumerable<FileInfoEntity> GetList()
         {
             string sql = "select * from LR_OA_FileInfo where F_DeleteMark = 0";
-            return this.BaseRepository().FindList<FileInfoEntity>();
+            return this.BaseRepository().FindList<FileInfoEntity>(sql);
+        }
+        public IEnumerable<FileInfoEntity> GetListByJson(string queryJson)
+        {
+            var dp = new object();
+            var queryParam = queryJson.ToJObject();
+            var strSql = new StringBuilder();
+            strSql.Append("select * from LR_OA_FileInfo where F_DeleteMark = 0 ");
+            if (!queryParam["year"].IsEmpty())
+            {
+                dp = new { year = queryParam["year"].ToInt() };
+                strSql.Append(" and DATEPART(yyyy,F_CreateDate) = @year ");
+            }
+            else
+            {
+                dp = new { year = DateTime.Now.Year };
+                strSql.Append(" and DATEPART(yyyy,F_CreateDate) = @year ");
+            }
+            return this.BaseRepository().FindList<FileInfoEntity>(strSql.ToString(),dp);
         }
 
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutBLL.cs

@@ -114,7 +114,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        /// <summary>
+        /// 获取KC实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public IEnumerable<TextbookInOutEntity> GetInOrOutEntity(string keyValue)
+        {
+            try
+            {
+                return textbookInOutService.GetInOrOutEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutEntity.cs

@@ -146,7 +146,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [Column("ISSUBMIT")]
         public int? IsSubmit { get; set; }
-        
+
+        /// <summary>
+        /// 出库货入库
+        /// </summary>
+        [NotMapped]
+        public string CKORRK { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutIBLL.cs

@@ -40,6 +40,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         TextbookInOutEntity GetKCEntity(string keyValue);
+        /// <summary>
+        /// 使用明细
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <returns></returns>
+        IEnumerable<TextbookInOutEntity> GetInOrOutEntity(string keyValue);
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextbookInOut/TextbookInOutService.cs

@@ -4,6 +4,7 @@ using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.EducationalAdministration
@@ -125,7 +126,60 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public IEnumerable<TextbookInOutEntity> GetInOrOutEntity(string keyValue)
+        {
+            try
+            {
+                List<TextbookInOutEntity> returnList = new List<TextbookInOutEntity>();
+                //TextbookInOutEntity InOutList = new TextbookInOutEntity();
+                List<TextBookInEntity> InEntity = this.BaseRepository("CollegeMIS").FindList<TextBookInEntity>(x => x.InOutCode == keyValue).ToList();
+                List<TextBookOutEntity> OutEntity = this.BaseRepository("CollegeMIS").FindList<TextBookOutEntity>(x => x.InOutCode == keyValue).ToList();
+                if (InEntity.Count() > 0 || OutEntity.Count() > 0)
+                {
+                    for (int i = 0; i < InEntity.Count(); i++)
+                    {
+                        TextbookInOutEntity InOutList = new TextbookInOutEntity();
+                        InOutList.CKORRK = "入库";
+                        InOutList.InorOut = InEntity[i].InOutCode;
+                        InOutList.BookCode = InEntity[i].BookCode;
+                        InOutList.variate = InEntity[i].variate;
+                        InOutList.CreateTime = InEntity[i].CreateTime;
+                        InOutList.CrateUserID = InEntity[i].CrateUserID;
+                        InOutList.Remark = InEntity[i].Remark;
+                        returnList.Add(InOutList);
+                    }
+                    for (int j = 0; j < OutEntity.Count(); j++)
+                    {
+                        TextbookInOutEntity InOutList = new TextbookInOutEntity();
+                        InOutList.CKORRK = "出库";
+                        InOutList.InorOut = OutEntity[j].InOutCode;
+                        InOutList.BookCode = OutEntity[j].BookCode;
+                        InOutList.variate = OutEntity[j].Variate;
+                        InOutList.CreateTime = InEntity[j].CreateTime;
+                        InOutList.CrateUserID = InEntity[j].CrateUserID;
+                        InOutList.Remark = OutEntity[j].Remark;
+                        returnList.Add(InOutList);
+                    }
+                }
+                return returnList;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据