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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/FormulaChildController.cs

@@ -113,10 +113,9 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveList(string mainEntity, List<FormulaChildEntity> strEntity)
+        public ActionResult SaveList(string MainId, List<FormulaChildEntity> strEntity)
         {
-            FormulaChildEntity model = mainEntity.ToObject<FormulaChildEntity>();
-            formulaChildIBLL.SaveList(model.MainId, strEntity);
+            formulaChildIBLL.SaveList(MainId, strEntity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/QualityReportController.cs

@@ -0,0 +1,36 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-06-22 11:07
+    /// 描 述：上报
+    /// </summary>
+    public class QualityReportController : MvcControllerBase
+    {
+        private QualityReportMainIBLL fualityReportMainIBLL = new QualityReportMainBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        
+        #endregion
+        
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/CalculateProject/Index.js

@@ -86,10 +86,9 @@ var bootstrap = function ($, learun) {
                         }},
                     { label: "值", name: "Value", width: 100, align: "left"},
                     { label: "排序", name: "Sort", width: 100, align: "left"},
-                    { label: "状态", name: "IsEnable", width: 100, align: "left",
+                    { label: "是否启用", name: "IsEnable", width: 100, align: "left",
                         formatter: function (cellvalue) {
-                            return cellvalue == 0 ? "<span class=\"label label-danger\">禁用</span>" : "<span class=\"label label-success\">启用</span>";
-
+                            return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }},
                 ],
                 mainId:'Id',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/FormulaMain/FormChild.js

@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#MainId').lrDataSourceSelect({ code: 'FormulaMain', value: 'id', text: 'name' });
             $('#ProjectId').lrDataSourceSelect({ code: 'CalculateProject', value: 'id', text: 'name' });
-
+            $('#MainId').lrselectSet(keyValue);
             // 新增
             $('#lr_add').on('click', function () {
                 page.addcontent();
@@ -61,7 +61,6 @@ var bootstrap = function ($, learun) {
                     $('#content1').html('');
                     var html = '';
                     if (data) {
-                        $('#MainId').lrselectSet(data[0].MainId);
                         for (var i = 0; i < data.length; i++) {
                             var id = learun.newGuid();
                             var html = '';
@@ -161,10 +160,10 @@ var bootstrap = function ($, learun) {
         var strEntity = JSON.stringify($('body').lrGetFormData());
 
         var postData = {
-            mainEntity: strEntity,
+            //mainEntity: strEntity,
             strEntity: arr
         };
-        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/FormulaChild/SaveList', postData, function (res) {
+        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/FormulaChild/SaveList?MainId=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/FormulaMain/Index.cshtml

@@ -25,7 +25,7 @@
                     <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_editgs" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑公式</a>
+                        <a id="lr_editgs" 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>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/FormulaMain/Index.js

@@ -49,13 +49,13 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 编辑公式
+            // 设置公式
             $('#lr_editgs').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
-                        title: '编辑',
+                        title: '设置公式',
                         url: top.$.rootUrl + '/LR_Desktop/FormulaMain/FormChild?keyValue=' + keyValue,
                         width: 600,
                         height: 500,
@@ -88,17 +88,16 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_Desktop/FormulaMain/GetPageList',
                 headData: [
-                    { label: "名称", name: "Name", width: 100, align: "left" },
+                    { label: "名称", name: "Name", width: 150, align: "left" },
+                    { label: "公式", name: "Result", width: 250, align: "left" },
                     { label: "排序", name: "Sort", width: 100, align: "left" },
+                    { label: "描述", name: "Desc", width: 200, align: "left" },
                     {
                         label: "状态", name: "IsEnable", width: 100, align: "left",
                         formatter: function (cellvalue) {
-                            return cellvalue == 0 ? "<span class=\"label label-danger\">禁用</span>" : "<span class=\"label label-success\">启用</span>";
-
+                            return cellvalue == 1 ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
-                    },
-                    { label: "公式", name: "Result", width: 250, align: "left" },
-                    { label: "描述", name: "Desc", width: 100, align: "left" }
+                    }
                 ],
                 mainId: 'Id',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.cshtml

@@ -0,0 +1,23 @@
+@{
+    ViewBag.Title = "数据上报";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="FormulaMain">
+        <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="FormulaMain">
+        <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
+        <input id="Sort" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FormulaMain">
+        <div class="lr-form-item-title">选项<font face="宋体">*</font></div>
+        <div id="IsEnable"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FormulaMain">
+        <div class="lr-form-item-title">描述</div>
+        <textarea id="Desc" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/QualityReport/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js

@@ -0,0 +1,54 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-22 11:07
+ * 描  述：数据上报
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#IsEnable').lrRadioCheckbox({
+                type: 'radio',
+                code: 'EnableStatus',
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LR_Desktop/FormulaMain/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 + '/LR_Desktop/FormulaMain/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.cshtml

@@ -0,0 +1,37 @@
+@{
+    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="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>
+                        </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_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看上报信息</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;提交</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/QualityReport/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js

@@ -0,0 +1,144 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-06-22 11:07
+ * 描  述：公式管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 填报
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '填报数据',
+                    url: top.$.rootUrl + '/LR_Desktop/FormulaMain/Form',
+                    width: 600,
+                    height: 400,
+                    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 + '/LR_Desktop/FormulaMain/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetPageList',
+                headData: [
+                    { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" },
+                    //{ label: "序号", name: "SerialNo", width: 100, align: "center" },
+                    { label: "项目名称", name: "ProjectName", width: 300, align: "center" },
+                    {
+                        label: "填报周期", name: "FillingCycle", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ThisCycle',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "填报时间", name: "FillingTime", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'CycleTime',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "填报部门", name: "FillingDept", width: 100, align: "center",
+                        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: "FillingPeople", width: 150, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "状态", name: "State", width: 150, align: "center",
+                        formatter: function (cellvalue) {
+                            if (cellvalue === 0) {
+                                return '<span class=\"label label-warning\">草稿</span>';
+                            } else if (cellvalue === 1) {
+                                return '<span class=\"label label-success\">待设置填报人</span>';
+                            } else if (cellvalue === 2) {
+                                return '<span class=\"label label-success\">待设置公式</span>';
+                            } else {
+                                return '<span class=\"label label-default\">已完成</span>';
+                            }
+                        }
+                    },
+                    { label: "备注", name: "Demo", width: 300, align: "center" },
+                ],
+                mainId: 'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            //param.State = 3;
+            //param.FillingPeople = learun.clientdata.get(['userinfo']).userId;
+            $('#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

@@ -392,6 +392,7 @@
     <Compile Include="Areas\LR_Desktop\Controllers\DTListController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTSettingController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTTargetController.cs" />
+    <Compile Include="Areas\LR_Desktop\Controllers\QualityReportController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\WeChatDevelopController.cs" />
     <Compile Include="Areas\LR_Desktop\LR_DesktopAreaRegistration.cs" />
     <Compile Include="Areas\LR_DisplayBoard\Controllers\LR_KBConfigInfoController.cs" />
@@ -1292,6 +1293,8 @@
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.js" />
     <Content Include="Areas\LR_Desktop\Views\FormulaMain\FormChild.js" />
     <Content Include="Areas\LR_Desktop\Views\MessageRind\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\QualityReport\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\QualityReport\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Index.js" />
     <Content Include="Areas\LR_DisplayBoard\Views\LR_KBConfigInfo\ChartForm.css" />
@@ -7344,6 +7347,8 @@
     <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Form.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Index.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\FormulaMain\FormChild.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\QualityReport\Index.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\QualityReport\Form.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_Desktop/QualityReportChildMap.cs

@@ -0,0 +1,28 @@
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using System.Data.Entity.ModelConfiguration;
+
+namespace Learun.Application.Mapping
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-06-23 17:26 
+    /// 描 述：上报子表 
+    /// </summary> 
+    public class QualityReportChildMap : EntityTypeConfiguration<QualityReportChildEntity>
+    {
+        public QualityReportChildMap()
+        {
+            #region 表、主键 
+            //表 
+            this.ToTable("QUALITYREPORTCHILD");
+            //主键 
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系 
+            #endregion
+        }
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/QualityReportMainMap.cs

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

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

@@ -114,6 +114,8 @@
     <Compile Include="LR_CodeDemo\LR_OA_ProjectMap.cs" />
     <Compile Include="LR_CRM\CrmCustomerContactMap.cs" />
     <Compile Include="LR_CRM\CrmChanceMap.cs" />
+    <Compile Include="LR_Desktop\QualityReportChildMap.cs" />
+    <Compile Include="LR_Desktop\QualityReportMainMap.cs" />
     <Compile Include="LR_Desktop\WeChatDevelopMap.cs" />
     <Compile Include="LR_Excel\ExcelExportMap.cs" />
     <Compile Include="LR_Excel\ExcelImportFieldMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary> 
+        /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+        /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+        /// 创 建：超级管理员 
+        /// 日 期：2021-06-23 17:26 
+        /// 描 述：上报子表 
+        /// </summary> 
+    public class QualityReportChildBLL : QualityReportChildIBLL
+    {
+        private QualityReportChildService qualityReportChildService = new QualityReportChildService();
+
+        #region 获取数据 
+
+        /// <summary> 
+                /// 获取页面显示列表数据 
+                /// </summary> 
+                /// <param name="pagination">分页参数</param> 
+                /// <param name="queryJson">查询参数</param> 
+                /// <returns></returns> 
+        public IEnumerable<QualityReportChildEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return qualityReportChildService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 获取QualityReportChild表实体数据 
+                /// </summary> 
+                /// <param name="keyValue">主键</param> 
+                /// <returns></returns> 
+        public QualityReportChildEntity GetQualityReportChildEntity(string keyValue)
+        {
+            try
+            {
+                return qualityReportChildService.GetQualityReportChildEntity(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
+            {
+                qualityReportChildService.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, QualityReportChildEntity entity)
+        {
+            try
+            {
+                qualityReportChildService.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_Desktop/QualityReportChild/QualityReportChildEntity.cs

@@ -0,0 +1,74 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-06-23 17:26 
+    /// 描 述：上报子表 
+    /// </summary> 
+    public class QualityReportChildEntity
+    {
+        #region 实体成员 
+        /// <summary> 
+        /// Id 
+        /// </summary> 
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary> 
+        /// 主表Id 
+        /// </summary> 
+        [Column("MAINID")]
+        public string MainId { get; set; }
+        /// <summary> 
+        /// 计算项目Id 
+        /// </summary> 
+        [Column("PROJECTID")]
+        public string ProjectId { get; set; }
+        /// <summary> 
+        /// 值 
+        /// </summary> 
+        [Column("VALUE")]
+        public string Value { get; set; }
+        /// <summary> 
+        /// 创建时间 
+        /// </summary> 
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary> 
+        /// 创建人 
+        /// </summary> 
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary> 
+        /// 创建人 
+        /// </summary> 
+        [Column("CREATEUSERNAME")]
+        public string CreateUserName { 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/LR_Desktop/QualityReportChild/QualityReportChildIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs

@@ -0,0 +1,145 @@
+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_Desktop
+{
+    /// <summary> 
+        /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+        /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+        /// 创 建：超级管理员 
+        /// 日 期：2021-06-23 17:26 
+        /// 描 述：上报子表 
+        /// </summary> 
+    public class QualityReportChildService : RepositoryFactory
+    {
+        #region 获取数据 
+
+        /// <summary> 
+                /// 获取页面显示列表数据 
+                /// </summary> 
+                /// <param name="pagination">查询参数</param> 
+                /// <param name="queryJson">查询参数</param> 
+                /// <returns></returns> 
+        public IEnumerable<QualityReportChildEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" 
+                t.Id, 
+                t.ProjectId 
+                ");
+                strSql.Append("  FROM QualityReportChild t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数 
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<QualityReportChildEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 获取QualityReportChild表实体数据 
+                /// </summary> 
+                /// <param name="keyValue">主键</param> 
+                /// <returns></returns> 
+        public QualityReportChildEntity GetQualityReportChildEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<QualityReportChildEntity>(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<QualityReportChildEntity>(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, QualityReportChildEntity 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/LR_Desktop/QualityReportMain/QualityReportMainBLL.cs

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

@@ -0,0 +1,74 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary> 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+    /// 创 建：超级管理员 
+    /// 日 期：2021-06-23 17:12 
+    /// 描 述：上报主表
+    /// </summary> 
+    public class QualityReportMainEntity
+    {
+        #region 实体成员 
+        /// <summary> 
+        /// Id 
+        /// </summary> 
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary> 
+        /// 选择上报的项目Id 
+        /// </summary> 
+        [Column("FILLINFROMID")]
+        public string FillinFromId { get; set; }
+        /// <summary> 
+        /// 上报时间 
+        /// </summary> 
+        [Column("REPORTTIME")]
+        public DateTime? ReportTime { get; set; }
+        /// <summary> 
+        /// 状态 0 草稿，1提交 
+        /// </summary> 
+        [Column("STATUS")]
+        public int? Status { get; set; }
+        /// <summary> 
+        /// 创建时间 
+        /// </summary> 
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary> 
+        /// 创建人 
+        /// </summary> 
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary> 
+        /// 创建人 
+        /// </summary> 
+        [Column("CREATEUSERNAME")]
+        public string CreateUserName { 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/LR_Desktop/QualityReportMain/QualityReportMainIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs

@@ -0,0 +1,145 @@
+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_Desktop
+{
+    /// <summary> 
+        /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 
+        /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+        /// 创 建：超级管理员 
+        /// 日 期：2021-06-23 17:12 
+        /// 描 述：上报主表
+        /// </summary> 
+    public class QualityReportMainService : RepositoryFactory
+    {
+        #region 获取数据 
+
+        /// <summary> 
+                /// 获取页面显示列表数据 
+                /// </summary> 
+                /// <param name="pagination">查询参数</param> 
+                /// <param name="queryJson">查询参数</param> 
+                /// <returns></returns> 
+        public IEnumerable<QualityReportMainEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" 
+                t.Id, 
+                t.FillinFromId 
+                ");
+                strSql.Append("  FROM QualityReportMain t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数 
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<QualityReportMainEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary> 
+                /// 获取QualityReportMain表实体数据 
+                /// </summary> 
+                /// <param name="keyValue">主键</param> 
+                /// <returns></returns> 
+        public QualityReportMainEntity GetQualityReportMainEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<QualityReportMainEntity>(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<QualityReportMainEntity>(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, QualityReportMainEntity 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/Learun.Application.TwoDevelopment.csproj

@@ -269,6 +269,14 @@
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderBLL.cs" />
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderIBLL.cs" />
     <Compile Include="LR_CodeDemo\WorkOrder\WorkOrderService.cs" />
+    <Compile Include="LR_Desktop\QualityReportChild\QualityReportChildBLL.cs" />
+    <Compile Include="LR_Desktop\QualityReportChild\QualityReportChildEntity.cs" />
+    <Compile Include="LR_Desktop\QualityReportChild\QualityReportChildIBLL.cs" />
+    <Compile Include="LR_Desktop\QualityReportChild\QualityReportChildService.cs" />
+    <Compile Include="LR_Desktop\QualityReportMain\QualityReportMainBLL.cs" />
+    <Compile Include="LR_Desktop\QualityReportMain\QualityReportMainIBLL.cs" />
+    <Compile Include="LR_Desktop\QualityReportMain\QualityReportMainEntity.cs" />
+    <Compile Include="LR_Desktop\QualityReportMain\QualityReportMainService.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopBLL.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopEntity.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopIBLL.cs" />