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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ProjectDataManageController.cs

@@ -0,0 +1,120 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-21 15:49
+    /// 描 述：项目资料管理
+    /// </summary>
+    public class ProjectDataManageController : MvcControllerBase
+    {
+        private ProjectDataManageIBLL projectDataManageIBLL = new ProjectDataManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = projectDataManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var ProjectDataManageData = projectDataManageIBLL.GetProjectDataManageEntity(keyValue);
+            var jsonData = new
+            {
+                ProjectDataManage = ProjectDataManageData,
+            };
+            return Success(jsonData);
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            projectDataManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            ProjectDataManageEntity entity = strEntity.ToObject<ProjectDataManageEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUserId = LoginUserInfo.Get().userId;
+            projectDataManageIBLL.SaveEntity(keyValue, entity);
+
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ProjectManageController.cs

@@ -4,6 +4,7 @@ using Learun.Application.TwoDevelopment.LogisticsManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System;
+using System.Linq;
 
 namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
 {
@@ -63,6 +64,20 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = projectManageIBLL.GetList(queryJson).OrderByDescending(x => x.CreateTime);
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Form.cshtml

@@ -0,0 +1,35 @@
+@{
+    ViewBag.Title = "项目资料管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">项目<font face="宋体">*</font></div>
+        <div id="PId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">项目阶段<font face="宋体">*</font></div>
+        <div id="PPId" readonly="readonly" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">项目资料名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">资料文件</div>
+        <div id="Files"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">负责部门</div>
+        <div id="DepartmentId"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">负责人</div>
+        <div id="ManagerId"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ProjectDataManage">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ProjectDataManage/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Form.js

@@ -0,0 +1,82 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-21 15:49
+ * 描  述：项目资料管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var PPId = request("PPId");
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#PId').lrselect({
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectManage/GetList',
+                value: "Id",
+                text: "Name",
+            });
+            $('#PPId').lrselect({
+                type: 'tree',
+                // 展开最大高度
+                maxHeight: 200,
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectPhaseManage/GetTree',
+                select: function (item) {
+                    if (item != null && item != undefined) {
+                        
+                    }
+                }
+            });
+            if (!!PPId) {
+                $('#PPId').lrselectSet(PPId);
+            }
+
+            $('#Files').lrUploader();
+            $('#DepartmentId').lrDepartmentSelect();
+            $('#ManagerId').lrUserSelect(0);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Index.cshtml

@@ -0,0 +1,55 @@
+@{
+                /**/
+
+                ViewBag.Title = "项目资料管理";
+                Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlt ">阶段</div>
+            <div id="dataTree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap  ">
+            <div class="lr-layout-title">
+                <span id="titleinfo" class="lrlt">未选择阶段</span> - <span class="lrlt">列表信息</span>
+            </div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <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>
+                                    <input id="Name" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">负责部门</div>
+                                    <div id="DepartmentId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">负责人</div>
+                                    <div id="ManagerId"></div>
+                                </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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ProjectDataManage/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectDataManage/Index.js

@@ -0,0 +1,135 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-21 15:49
+ * 描  述：项目资料管理
+ */
+var refreshGirdData;
+var PPId;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.inittree();
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#DepartmentId').lrDepartmentSelect();
+            $('#ManagerId').lrUserSelect(0);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                if (!PPId) {
+                    learun.alert.warning('请选择阶段！');
+                    return false;
+                }
+                learun.layerForm({
+                    id: 'ProjectDataManageform',
+                    title: '新增',
+                    url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/Form?PPId=' + PPId,
+                    width: 800,
+                    height: 600,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'ProjectDataManageform',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/Form?keyValue=' + keyValue,
+                        width: 800,
+                        height: 600,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        inittree: function () {
+            // 初始化左侧树形数据
+            $('#dataTree').lrtree({
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectPhaseManage/GetTree',
+                nodeClick: page.treeNodeClick
+            });
+        },
+        treeNodeClick: function (item) {
+            PPId = item.id;
+            $('#titleinfo').text(item.text);
+            page.search();
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/GetPageList',
+                headData: [
+                    { label: "项目资料名称", name: "Name", width: 200, align: "left" },
+                    {
+                        label: "负责部门", name: "DepartmentId", width: 100, 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: "ManagerId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "时间", name: "CreateTime", width: 130, align: "left" },
+                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.PPId = PPId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -357,6 +357,7 @@
     <Compile Include="Areas\EducationalAdministration\EducationalAdministrationAreaRegistration.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\APAppointmentPsychologistController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\CompanyNewsController.cs" />
+    <Compile Include="Areas\LogisticsManagement\Controllers\ProjectDataManageController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\ProjectPhaseManageController.cs" />
     <Compile Include="Areas\LogisticsManagement\LogisticsManagementAreaRegistration.cs" />
     <Compile Include="Areas\LR_AuthorizeModule\Controllers\AuthorizeController.cs" />
@@ -1199,6 +1200,8 @@
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\CompanyNews\Index.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Form.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Index.js" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Form.js" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Index.js" />
     <Content Include="Areas\LR_AuthorizeModule\Views\Authorize\AppForm.js" />
@@ -7318,6 +7321,8 @@
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_IncomeManage\Form3.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Form.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Index.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Form.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Index.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/Learun.Application.Mapping.csproj

@@ -98,6 +98,7 @@
     <Compile Include="EvaluationTeach\Eval_QuestionItemsMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionMap.cs" />
     <Compile Include="EvaluationTeach\Eval_QuestionResultMap.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManageMap.cs" />
     <Compile Include="LogisticsManagement\ProjectPhaseManageMap.cs" />
     <Compile Include="LR_App\DTImgMap.cs" />
     <Compile Include="LR_App\FunctionMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LogisticsManagement/ProjectDataManageMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-21 15:49
+    /// 描 述：项目资料管理
+    /// </summary>
+    public class ProjectDataManageMap : EntityTypeConfiguration<ProjectDataManageEntity>
+    {
+        public ProjectDataManageMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("PROJECTDATAMANAGE");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1623922789" Name="Physical Data Model 1" Objects="3404" Symbols="396" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1624333323" Name="Physical Data Model 1" Objects="3402" Symbols="396" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12279,7 +12279,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1623922619</a:CreationDate>
 <a:ModificationDate>1623922622</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-415175,-33257), (-402327,-24409))</a:Rect>
+<a:Rect>((-415175,-33669), (-402327,-23997))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -49767,7 +49767,7 @@ B9AF
 <a:Code>ProjectDataManage</a:Code>
 <a:CreationDate>1588041182</a:CreationDate>
 <a:Creator>edz</a:Creator>
-<a:ModificationDate>1623922789</a:ModificationDate>
+<a:ModificationDate>1624333323</a:ModificationDate>
 <a:Modifier>edz</a:Modifier>
 <a:Comment>项目资料管理</a:Comment>
 <a:TotalSavingCurrency/>
@@ -49879,9 +49879,21 @@ B9AF
 <a:DataType>nvarchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
+<o:Column Id="o3334">
+<a:ObjectID>4448933F-29C9-4689-96A4-A56FA068321B</a:ObjectID>
+<a:Name>资料文件</a:Name>
+<a:Code>Files</a:Code>
+<a:CreationDate>1624333304</a:CreationDate>
+<a:Creator>edz</a:Creator>
+<a:ModificationDate>1624333323</a:ModificationDate>
+<a:Modifier>edz</a:Modifier>
+<a:Comment>资料文件</a:Comment>
+<a:DataType>nvarchar(50)</a:DataType>
+<a:Length>50</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o3334">
+<o:Key Id="o3335">
 <a:ObjectID>7632E93E-CDB3-4A90-AFB8-E9565D9CB304</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -49895,10 +49907,10 @@ B9AF
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o3334"/>
+<o:Key Ref="o3335"/>
 </c:PrimaryKey>
 <c:ClusterObject>
-<o:Key Ref="o3334"/>
+<o:Key Ref="o3335"/>
 </c:ClusterObject>
 </o:Table>
 </c:Tables>
@@ -49923,7 +49935,7 @@ B9AF
 <o:Key Ref="o695"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3335">
+<o:ReferenceJoin Id="o3336">
 <a:ObjectID>14D78C43-17A2-48F0-83B4-3DF757D5ABE8</a:ObjectID>
 <a:CreationDate>1552635393</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -49958,7 +49970,7 @@ B9AF
 <o:Key Ref="o791"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3336">
+<o:ReferenceJoin Id="o3337">
 <a:ObjectID>FEAECB7B-8E2A-4492-A530-B0062E1511B8</a:ObjectID>
 <a:CreationDate>1552635777</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -49993,7 +50005,7 @@ B9AF
 <o:Key Ref="o819"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3337">
+<o:ReferenceJoin Id="o3338">
 <a:ObjectID>81527A47-E565-49C2-AAA7-F0555E81CE72</a:ObjectID>
 <a:CreationDate>1553245426</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50028,7 +50040,7 @@ B9AF
 <o:Key Ref="o830"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3338">
+<o:ReferenceJoin Id="o3339">
 <a:ObjectID>A3225D9D-069C-4A67-ABF0-43DC2FA55CF0</a:ObjectID>
 <a:CreationDate>1553247802</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50062,7 +50074,7 @@ B9AF
 <o:Key Ref="o727"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3339">
+<o:ReferenceJoin Id="o3340">
 <a:ObjectID>B458081F-CEE1-4251-9E7A-5E9CC93519D5</a:ObjectID>
 <a:CreationDate>1553248376</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50097,7 +50109,7 @@ B9AF
 <o:Key Ref="o808"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3340">
+<o:ReferenceJoin Id="o3341">
 <a:ObjectID>8397C4F6-A728-4D3F-B2F8-FAC56886462B</a:ObjectID>
 <a:CreationDate>1553248622</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50131,7 +50143,7 @@ B9AF
 <o:Key Ref="o868"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3341">
+<o:ReferenceJoin Id="o3342">
 <a:ObjectID>2F8BC700-F31E-41CC-9DA8-9505EAC5DA85</a:ObjectID>
 <a:CreationDate>1553483161</a:CreationDate>
 <a:Creator>l</a:Creator>
@@ -50165,7 +50177,7 @@ B9AF
 <o:Key Ref="o901"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o3342">
+<o:ReferenceJoin Id="o3343">
 <a:ObjectID>0E2D2049-564F-4247-9F5B-B0AA82F9BE96</a:ObjectID>
 <a:CreationDate>1555404296</a:CreationDate>
 <a:Creator>admin</a:Creator>
@@ -50182,7 +50194,7 @@ B9AF
 </o:Reference>
 </c:References>
 <c:DefaultGroups>
-<o:Group Id="o3343">
+<o:Group Id="o3344">
 <a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -50445,7 +50457,7 @@ B9AF
 </o:ExtendedDependency>
 </c:ChildTraceabilityLinks>
 <c:TargetModels>
-<o:TargetModel Id="o3344">
+<o:TargetModel Id="o3345">
 <a:ObjectID>B1BAD530-6C69-4A9D-BD41-F62F564CA348</a:ObjectID>
 <a:Name>Microsoft SQL Server 2008</a:Name>
 <a:Code>MSSQLSRV2008</a:Code>

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

@@ -248,6 +248,10 @@
     <Compile Include="Feixing\UserModel.cs" />
     <Compile Include="LogisticsManagement\APAppointmentPsychologist\APAppointmentPsychologistEntity.cs" />
     <Compile Include="LogisticsManagement\CompanyNews\CompanyNewsEntity.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageEntity.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageIBLL.cs" />
+    <Compile Include="LogisticsManagement\ProjectDataManage\ProjectDataManageService.cs" />
     <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageBLL.cs" />
     <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageEntity.cs" />
     <Compile Include="LogisticsManagement\ProjectPhaseManage\ProjectPhaseManageIBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectDataManage/ProjectDataManageBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-21 15:49
+    /// 描 述：项目资料管理
+    /// </summary>
+    public class ProjectDataManageBLL : ProjectDataManageIBLL
+    {
+        private ProjectDataManageService projectDataManageService = new ProjectDataManageService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ProjectDataManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return projectDataManageService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ProjectDataManage表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ProjectDataManageEntity GetProjectDataManageEntity(string keyValue)
+        {
+            try
+            {
+                return projectDataManageService.GetProjectDataManageEntity(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
+            {
+                projectDataManageService.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>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, ProjectDataManageEntity entity)
+        {
+            try
+            {
+                projectDataManageService.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/LogisticsManagement/ProjectDataManage/ProjectDataManageEntity.cs

@@ -0,0 +1,90 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-21 15:49
+    /// 描 述：项目资料管理
+    /// </summary>
+    public class ProjectDataManageEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        [Column("PID")]
+        public string PId { get; set; }
+        /// <summary>
+        /// 项目阶段Id
+        /// </summary>
+        [Column("PPID")]
+        public string PPId { get; set; }
+        /// <summary>
+        /// 项目资料名称
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 负责部门
+        /// </summary>
+        [Column("DEPARTMENTID")]
+        public string DepartmentId { get; set; }
+        /// <summary>
+        /// 负责人
+        /// </summary>
+        [Column("MANAGERID")]
+        public string ManagerId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 资料文件
+        /// </summary>
+        [Column("FILES")]
+        public string Files { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectDataManage/ProjectDataManageIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-21 15:49
+    /// 描 述：项目资料管理
+    /// </summary>
+    public interface ProjectDataManageIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ProjectDataManageEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取ProjectDataManage表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        ProjectDataManageEntity GetProjectDataManageEntity(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, ProjectDataManageEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectDataManage/ProjectDataManageService.cs

@@ -0,0 +1,166 @@
+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.LogisticsManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-21 15:49
+    /// 描 述：项目资料管理
+    /// </summary>
+    public class ProjectDataManageService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ProjectDataManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM ProjectDataManage t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Name Like @Name ");
+                }
+                if (!queryParam["DepartmentId"].IsEmpty())
+                {
+                    dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.DepartmentId = @DepartmentId ");
+                }
+                if (!queryParam["ManagerId"].IsEmpty())
+                {
+                    dp.Add("ManagerId",queryParam["ManagerId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ManagerId = @ManagerId ");
+                }
+                if (!queryParam["PId"].IsEmpty())
+                {
+                    dp.Add("PId",queryParam["PId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.PId = @PId ");
+                }
+                if (!queryParam["PPId"].IsEmpty())
+                {
+                    dp.Add("PPId", queryParam["PPId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.PPId = @PPId ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ProjectDataManageEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ProjectDataManage表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ProjectDataManageEntity GetProjectDataManageEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ProjectDataManageEntity>(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("CollegeMIS").Delete<ProjectDataManageEntity>(t=>t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, ProjectDataManageEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").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/LogisticsManagement/ProjectManage/ProjectManageBLL.cs

@@ -43,6 +43,30 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ProjectManageEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return projectManageService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取ProjectManage表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectManage/ProjectManageIBLL.cs

@@ -21,6 +21,14 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<ProjectManageEntity> GetPageList(Pagination pagination, string queryJson);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ProjectManageEntity> GetList(string queryJson);
         /// <summary>
         /// 获取ProjectManage表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ProjectManage/ProjectManageService.cs

@@ -71,6 +71,39 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ProjectManageEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM ProjectManage t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                
+                return this.BaseRepository("CollegeMIS").FindList<ProjectManageEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取ProjectManage表实体数据
         /// </summary>