合并冲突

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/ContractInfoController.cs

@@ -56,6 +56,15 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormSign()
+        {
+            return View();
+        }
         
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/ContractStandingBookController.cs

@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.CustomFunction.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-08-05 16:45
+    /// 描 述：合同台账管理
+    /// </summary>
+    public class ContractStandingBookController : MvcControllerBase
+    {
+        private ContractStandingBookIBLL contractStandingBookIBLL = new ContractStandingBookBLL();
+
+        #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 = contractStandingBookIBLL.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 ContractStandingBookData = contractStandingBookIBLL.GetContractStandingBookEntity( keyValue );
+            var jsonData = new {
+                ContractStandingBook = ContractStandingBookData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            contractStandingBookIBLL.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)
+        {
+            ContractStandingBookEntity entity = strEntity.ToObject<ContractStandingBookEntity>();
+            contractStandingBookIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/FormSign.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "合同审批管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="ContractInfo">
+        <div class="lr-form-item-title">签订时间<font face="宋体">*</font></div>
+        <input id="SignTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SignTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractInfo">
+        <div class="lr-form-item-title">签订人<font face="宋体">*</font></div>
+        <input id="SignUser" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractInfo">
+        <div class="lr-form-item-title">签订对方<font face="宋体">*</font></div>
+        <input id="SignOtherParty" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ContractInfo/FormSign.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/FormSign.js

@@ -0,0 +1,50 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-02 16:47
+ * 描  述：合同审批管理
+ */
+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 () {
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ContractInfo/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 + '/CustomFunction/ContractInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/IndexSign.js

@@ -21,31 +21,14 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/CustomFunction/ContractInfo/Form',
-                    width: 700,
-                    height: 500,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
             // 编辑
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
-                    var Status = $('#gridtable').jfGridValue('Status');
-                    if (Status != '0') {
-                        return learun.warning.alert('选中项已提交，不可编辑！');
-                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/CustomFunction/ContractInfo/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/CustomFunction/ContractInfo/FormSign?keyValue=' + keyValue,
                         width: 700,
                         height: 500,
                         callBack: function (id) {
@@ -66,49 +49,18 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "合同名称", name: "Name", width: 100, align: "left" },
                     { label: "合同编号", name: "EnCode", width: 100, align: "left" },
-                    { label: "合同开始时间", name: "StartTime", width: 100, align: "left" },
-                    { label: "合同结束时间", name: "EndTime", width: 100, align: "left" },
-                    { label: "合同标的", name: "Target", width: 100, align: "left" },
-                    {
-                        label: "合同类型", name: "Type", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'htlx',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
                     { label: "合同金额", name: "Amount", width: 100, align: "left" },
                     { label: "对方单位名称", name: "OtherParty", width: 100, align: "left" },
                     { label: "对方单位联系人", name: "OtherPartyContacts", width: 100, align: "left" },
                     { label: "联系方式", name: "OtherPartyMobile", width: 100, align: "left" },
                     {
-                        label: "申报人", name: "CreateUserId", 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: 100, align: "left" },
-                    {
-                        label: "状态", name: "Status", width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue == 0) {
-                                return "<span class=\"label label-default\">草稿</span>";
-                            } else if (cellvalue == 1) {
-                                return "<span class=\"label label-warning\">审批中</span>";
-                            } else if (cellvalue == 2) {
-                                return "<span class=\"label label-success\">审批通过</span>";
-                            }
+                        label: "签订时间", name: "SignTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
                         }
                     },
+                    { label: "签订人", name: "SignUser", width: 100, align: "left" },
+                    { label: "签订对方", name: "SignOtherParty", width: 100, align: "left" }
                 ],
                 mainId: 'Id',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/Form.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "合同台账管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">合同已支付金额<font face="宋体">*</font></div>
+        <input id="PayAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">合同余款<font face="宋体">*</font></div>
+        <input id="Balance" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">合同份数</div>
+        <input id="Num" type="number" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">合同履行情况</div>
+        <input id="Desc" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+        <div class="lr-form-item-title">备注</div>
+        <input id="Remark" type="text" class="form-control"  />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/ContractStandingBook/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/Form.js

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-05 16:45
+ * 描  述：合同台账管理
+ */
+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 () {
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo',value: 'id',text: 'name' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/ContractStandingBook/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 + '/CustomFunction/ContractStandingBook/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/Index.cshtml

@@ -0,0 +1,49 @@
+@{
+    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>
+                                    <div id="ContractId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">合同已支付金额</div>
+                                    <input id="PayAmount" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">合同余款</div>
+                                    <input id="Balance" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">合同份数</div>
+                                    <input id="Num" 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_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>
+                        <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/CustomFunction/Views/ContractStandingBook/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/Index.js

@@ -0,0 +1,107 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-08-05 16:45
+ * 描  述：合同台账管理
+ */
+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);
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo',value: 'id',text: 'name' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/Form',
+                    width: 600,
+                    height: 400,
+                    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: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/Form?keyValue=' + keyValue,
+                        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 + '/CustomFunction/ContractStandingBook/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetPageList',
+                headData: [
+                    { label: "合同名称", name: "ContractId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                 key: value,
+                                 keyId: 'id',
+                                 callback: function (_data) {
+                                     callback(_data['name']);
+                                 }
+                             });
+                        }},
+                    { label: "合同已支付金额", name: "PayAmount", width: 100, align: "left"},
+                    { label: "合同余款", name: "Balance", width: 100, align: "left"},
+                    { label: "合同份数", name: "Num", width: 100, align: "left"},
+                    { label: "合同履行情况", name: "Desc", width: 100, align: "left"},
+                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#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

@@ -843,6 +843,7 @@
     <Compile Include="Areas\CustomFunction\Controllers\RetireForecastController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\ContractInfoController.cs" />
     <Compile Include="Areas\CustomFunction\Controllers\ContractChangeController.cs" />
+    <Compile Include="Areas\CustomFunction\Controllers\ContractStandingBookController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\DtRaceTypeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\DtRaceInfoController.cs" />
   </ItemGroup>
@@ -960,6 +961,7 @@
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexTJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexYJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexData.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\FormSign.js" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexSign.js" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexFile.js" />
     <Content Include="Areas\CustomFunction\Views\EstimateRetire\FormYT.js" />
@@ -6564,6 +6566,10 @@
     <Content Include="Areas\CustomFunction\Views\ContractChange\Index.js" />
     <Content Include="Areas\CustomFunction\Views\ContractChange\Form.cshtml" />
     <Content Include="Areas\CustomFunction\Views\ContractChange\Form.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\Index.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\Index.js" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\Form.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractStandingBook\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\DtRaceType\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\DtRaceType\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\DtRaceType\Form.cshtml" />
@@ -7404,6 +7410,7 @@
     <Content Include="Areas\LR_NewWorkFlow\Views\Index.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\ApplyForIndex.cshtml" />
     <Content Include="Areas\CustomFunction\Views\ContractInfo\IndexSign.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\ContractInfo\FormSign.cshtml" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\Statistics.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/CustomFunction/ContractStandingBookMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.CustomFunction;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-08-05 16:45
+    /// 描 述：合同台账管理
+    /// </summary>
+    public class ContractStandingBookMap : EntityTypeConfiguration<ContractStandingBookEntity>
+    {
+        public ContractStandingBookMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("CONTRACTSTANDINGBOOK");
+            //主键
+            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

@@ -592,6 +592,7 @@
     <Compile Include="CustomFunction\RetireForecastMap.cs" />
     <Compile Include="CustomFunction\ContractInfoMap.cs" />
     <Compile Include="CustomFunction\ContractChangeMap.cs" />
+    <Compile Include="CustomFunction\ContractStandingBookMap.cs" />
     <Compile Include="EducationalAdministration\DtRaceTypeMap.cs" />
     <Compile Include="EducationalAdministration\DtRaceInfoMap.cs" />
   </ItemGroup>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractInfo/ContractInfoEntity.cs

@@ -89,6 +89,21 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         [Column("CREATEUSERNAME")]
         public string CreateUserName { get; set; }
+        /// <summary>
+        /// 签订时间
+        /// </summary>
+        [Column("SIGNTIME")]
+        public DateTime? SignTime { get; set; }
+        /// <summary>
+        /// 签订人
+        /// </summary>
+        [Column("SIGNUSER")]
+        public string SignUser { get; set; }
+        /// <summary>
+        /// 签订对方
+        /// </summary>
+        [Column("SIGNOTHERPARTY")]
+        public string SignOtherParty { get; set; }
         #endregion
 
         #region 扩展操作
@@ -98,6 +113,10 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractInfo/ContractInfoService.cs

@@ -44,7 +44,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 t.OtherPartyContacts,
                 t.OtherPartyMobile,
                 t.CreateUserId,
-                t.CreateTime,t.Status
+                t.CreateTime,t.Status,t.SignTime,t.SignUser,t.SignOtherParty
                 ");
                 strSql.Append("  FROM ContractInfo t ");
                 strSql.Append("  WHERE 1=1 ");
@@ -136,7 +136,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 }
             }
         }
-        
+
         /// <summary>
         /// 
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractStandingBook/ContractStandingBookBLL.cs

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

@@ -0,0 +1,94 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-08-05 16:45
+    /// 描 述：合同台账管理
+    /// </summary>
+    public class ContractStandingBookEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 合同Id
+        /// </summary>
+        [Column("CONTRACTID")]
+        public string ContractId { get; set; }
+        /// <summary>
+        /// 合同已支付金额
+        /// </summary>
+        [Column("PAYAMOUNT")]
+        public decimal? PayAmount { get; set; }
+        /// <summary>
+        /// 合同余款
+        /// </summary>
+        [Column("BALANCE")]
+        public decimal? Balance { get; set; }
+        /// <summary>
+        /// 合同份数
+        /// </summary>
+        [Column("NUM")]
+        public int? Num { get; set; }
+        /// <summary>
+        /// 合同履行情况
+        /// </summary>
+        [Column("DESC")]
+        public string Desc { 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("CREATEUSERNAME")]
+        public string CreateUserName { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
+        }
+        /// <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/CustomFunction/ContractStandingBook/ContractStandingBookIBLL.cs

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractStandingBook/ContractStandingBookService.cs

@@ -0,0 +1,170 @@
+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.CustomFunction
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-08-05 16:45
+    /// 描 述：合同台账管理
+    /// </summary>
+    public class ContractStandingBookService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ContractStandingBookEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.ContractId,
+                t.PayAmount,
+                t.Balance,
+                t.Num,
+                t.[Desc],
+                t.Remark
+                ");
+                strSql.Append("  FROM ContractStandingBook t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["ContractId"].IsEmpty())
+                {
+                    dp.Add("ContractId",queryParam["ContractId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ContractId = @ContractId ");
+                }
+                if (!queryParam["PayAmount"].IsEmpty())
+                {
+                    dp.Add("PayAmount", "%" + queryParam["PayAmount"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.PayAmount Like @PayAmount ");
+                }
+                if (!queryParam["Balance"].IsEmpty())
+                {
+                    dp.Add("Balance", "%" + queryParam["Balance"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Balance Like @Balance ");
+                }
+                if (!queryParam["Num"].IsEmpty())
+                {
+                    dp.Add("Num", "%" + queryParam["Num"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Num Like @Num ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ContractStandingBookEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ContractStandingBook表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ContractStandingBookEntity GetContractStandingBookEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ContractStandingBookEntity>(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<ContractStandingBookEntity>(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, ContractStandingBookEntity 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

@@ -1787,6 +1787,10 @@
     <Compile Include="CustomFunction\ContractChange\ContractChangeService.cs" />
     <Compile Include="CustomFunction\ContractChange\ContractChangeBLL.cs" />
     <Compile Include="CustomFunction\ContractChange\ContractChangeIBLL.cs" />
+    <Compile Include="CustomFunction\ContractStandingBook\ContractStandingBookEntity.cs" />
+    <Compile Include="CustomFunction\ContractStandingBook\ContractStandingBookService.cs" />
+    <Compile Include="CustomFunction\ContractStandingBook\ContractStandingBookBLL.cs" />
+    <Compile Include="CustomFunction\ContractStandingBook\ContractStandingBookIBLL.cs" />
     <Compile Include="EducationalAdministration\DtRaceType\DtRaceTypeEntity.cs" />
     <Compile Include="EducationalAdministration\DtRaceType\DtRaceTypeService.cs" />
     <Compile Include="EducationalAdministration\DtRaceType\DtRaceTypeBLL.cs" />