【增加】预算管理-预算调整；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_BudgetBasicsController.cs

@@ -45,6 +45,30 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
             ViewBag.Date = DateTime.Now;
             return View();
         }
+
+        /// <summary>
+        /// 主页面【调整】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AdjustIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页【调整】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult AdjustForm()
+        {
+            var userInfo = LoginUserInfo.Get();
+            ViewBag.Name = userInfo.realName;
+            var dept = departmentIBLL.GetEntity(userInfo.departmentId);
+            ViewBag.Dept = dept == null ? "" : dept.F_FullName;
+            ViewBag.Date = DateTime.Now;
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -202,6 +226,38 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
             return Success("审核成功！");
 
         }
+        /// <summary>
+        /// 预算调整
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveAdjustForm(string keyValue, string strEntity)
+        {
+            FD_BudgetBasicsEntity entity = strEntity.ToObject<FD_BudgetBasicsEntity>();
+            entity.BStatus = 3;
+            entity.AdjustTime = DateTime.Now;
+            entity.AdjustUserId = LoginUserInfo.Get().userId;
+            fD_BudgetBasicsIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 提交、审批【调整】
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UpdateStatus(string keyValue, int Status)
+        {
+            fD_BudgetBasicsIBLL.UpdateStatus(keyValue, Status);
+            return Success("操作成功！");
+        }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/AdjustForm.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "基础信息上报";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">姓名</div>
+        <input  type="text" class="form-control" readonly="readonly" value="@ViewBag.Name" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">部门</div>
+        <input  type="text" class="form-control" readonly="readonly" value="@ViewBag.Dept" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">当前时间</div>
+        <input type="text" class="form-control" readonly="readonly" value="@ViewBag.Date" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="BFile"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="BRemarks" class="form-control" style="height: 100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/AdjustForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/AdjustForm.js

@@ -0,0 +1,117 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-05-27 17:42
+ * 描  述：基础信息上报
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#BFile').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'FD_BudgetBasics' && data[id]) {
+                            keyValue = data[id].BId;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        //setTimeout(function () {
+                        //    ue.setContent(data[id].F_NewsContent);
+                        //}, 100);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {};
+        var strEntity = $('body').lrGetFormData();
+        if (!!processId) {
+            strEntity.BProcessId = processId;
+        }
+        postData.strEntity = JSON.stringify(strEntity);
+
+        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/SaveAdjustForm?keyValue=' + keyValue, postData, function (res) {
+            if (!!processId) {
+                var res = {};
+                res.code = 200;
+                if (!!callBack) {
+                    callBack(res, i);
+                }
+
+            } else {
+                // 保存成功后才回调
+                if (!!callBack) {
+                    callBack(res, strEntity, i);
+                }
+            }
+        });
+    };
+    // 保存数据
+    //acceptClick = function (callBack) {
+    //    if (!$('body').lrValidform()) {
+    //        return false;
+    //    }
+    //    var postData = {
+    //        strEntity: JSON.stringify($('body').lrGetFormData())
+    //    };
+    //    $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/SaveAdjustForm?keyValue=' + keyValue, postData, function (res) {
+    //        // 保存成功后才回调
+    //        if (!!callBack) {
+    //            callBack();
+    //        }
+    //    });
+    //};
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/AdjustIndex.cshtml

@@ -0,0 +1,30 @@
+@{
+    ViewBag.Title = "基础信息上报";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></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_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;调整</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/AdjustIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/AdjustIndex.js

@@ -0,0 +1,211 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-05-27 17:42
+ * 描  述：基础信息上报
+ */
+var refreshGirdData;
+var processId = '';
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_eye').on('click', function () {
+                page.eye();
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('BId');
+                var status = $('#gridtable').jfGridValue('BStatus');
+                if (status != 2) {
+                    learun.alert.warning("当前项目未审批通过，不可调整！");
+                    return;
+                }
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'adjustform',
+                        title: '调整',
+                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/AdjustForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            top[id].save();
+                            return refreshGirdData('', '');
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            //  提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('BId');
+                if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('BStatus');
+                    if (status == 2) {
+                        learun.alert.warning("当前项目未调整！");
+                        return;
+                    }
+                    if (status != 3) {
+                        learun.alert.warning("当前项目已提交，请耐心等待审批！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/UpdateStatus', { keyValue: keyValue,status:4 }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            //审核
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('BId');
+                if (learun.checkrow(keyValue)) {
+                    var status = $('#gridtable').jfGridValue('BStatus');
+                    if (status == 5) {
+                        learun.alert.warning("当前项目已调整！");
+                        return;
+                    }
+                    if (status != 4) {
+                        learun.alert.warning("当前项目未提交！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/UpdateStatus', { keyValue: keyValue,status:5 }, function () {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/GetPageList',
+                headData: [
+                    { label: "姓名", name: "BName", width: 100, align: "left" },
+                    {
+                        label: '部门', name: 'BDept', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row) {
+                            learun.clientdata.getAsync('department', {
+                                key: value,
+                                callback: function (item) {
+                                    callback(item.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "创建时间", name: "BCreateTime", width: 150, align: "left" },
+                    { label: "备注", name: "BRemarks", width: 100, align: "left" },
+                    { label: "调整时间", name: "AdjustTime", width: 150, align: "left" },
+                    {
+                        label: "调整人", name: "AdjustUserId", 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: "BStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue == 3) {
+                                return '<span class=\"label label-default\" style=\"cursor: pointer;\">草稿</span>';
+                            } else if (cellvalue == 4) {
+                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">调整进行中</span>';
+                            } else if (cellvalue == 5) {
+                                return '<span class=\"label label-success\" style=\"cursor: pointer;\">已调整</span>';
+                            } else {
+                                return '<span class=\"label label-default\" style=\"cursor: pointer;\">未调整</span>';
+                            }
+                        }
+                    },
+                ],
+                mainId: 'BId',
+                isPage: true,
+                sidx: "BCreateTime",
+                sord:'desc'
+            });
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            param.SqlParameter = ' and BStatus>=2 ';
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        eye: function () {
+            var processId = $('#gridtable').jfGridValue('BProcessId') || '';
+
+            if (learun.checkrow(processId)) {
+                learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看【基础信息上报】', F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId });
+            }
+        }
+    };
+    //refreshGirdData = function () {
+    //    $('#gridtable').jfGridSet('reload');
+    //};
+    refreshGirdData = function (res, postData) {
+        if (res && res.code && res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'FD_BudgetBasics',// 填写流程对应模板编号 
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+
+        }
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/Index.js

@@ -150,16 +150,21 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('BId');
                 if (learun.checkrow(keyValue)) {
                     var status = $('#gridtable').jfGridValue('BStatus');
-                    if (status == 1) {
-                        learun.layerConfirm('是否确认审核通过该项！', function (res) {
-                            if (res) {
-                                learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/Checklist', { keyValue: keyValue }, function () {
-                                    refreshGirdData(res, {});
-                                });
-                            }
-                        });
+                    if (status >= 2) {
+                        learun.alert.warning("当前项目已审批！");
+                        return;
                     }
-                    
+                    if (status != 1) {
+                        learun.alert.warning("当前项目未提交！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_BudgetBasics/Checklist', { keyValue: keyValue }, function () {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
                 }
             });
         },
@@ -181,6 +186,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "创建时间", name: "BCreateTime", width: 150, align: "left" },
+                    { label: "备注", name: "BRemarks", width: 100, align: "left" },
                     {
                         label: "状态", name: "BStatus", width: 100, align: "left",
                         formatter: function (cellvalue) {
@@ -189,14 +195,21 @@ var bootstrap = function ($, learun) {
                             } else if (cellvalue == 1) {
                                 return '<span class=\"label label-warning\" style=\"cursor: pointer;\">进行中</span>';
                             } else if (cellvalue == 2) {
-                                return '<span class=\"label label-success\" style=\"cursor: pointer;\">已审批</span>';
+                                return '<span class=\"label label-success\" style=\"cursor: pointer;\">审批通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">未调整</span>';
+                            } else if (cellvalue == 4) {
+                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">正在调整</span>';
+                            } else if (cellvalue == 5) {
+                                return '<span class=\"label label-success\" style=\"cursor: pointer;\">已调整</span>';
                             }
                         }
                     },
-                    { label: "备注", name: "BRemarks", width: 100, align: "left" }
                 ],
                 mainId: 'BId',
-                isPage: true
+                isPage: true,
+                sidx: "BCreateTime",
+                sord: 'desc'
             });
         },
         search: function (param) {

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

@@ -1550,7 +1550,9 @@
     <Content Include="Areas\PersonnelManagement\Views\TeacherReimbursementManagement\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherRetire\IndexTJ.js" />
     <Content Include="Areas\PersonnelManagement\Views\TeacherTitleEvaluation\IndexTJ.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\AdjustForm.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\Form.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\AdjustIndex.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetFile\Form.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetFile\Index.js" />
@@ -7678,6 +7680,8 @@
     <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\FormXF.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\IndexXZDetail.cshtml" />
     <Content Include="Areas\CustomFunction\Views\PaymentAccount\ReceiptForm.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\AdjustIndex.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\AdjustForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -16,9 +16,15 @@
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_演示;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--123演示测试-->
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_演示;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_演示;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="waydbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=waydb;User ID=root;Password=QJKJ@bjqj@123" providerName="MySql.Data.MySqlClient" />-->
+  <!--地铁-->
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=bjdt_adms7utimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=bjdt_collegemis;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="waydbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=waydb;User ID=root;Password=QJKJ@bjqj@123" providerName="MySql.Data.MySqlClient" />
 
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_BudgetBasics/FD_BudgetBasicsBLL.cs

@@ -159,6 +159,30 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 }
             }
         }
+
+        /// <summary>
+        /// 更新状态
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="Status"></param>
+        public void UpdateStatus(string keyValue, int Status)
+        {
+            try
+            {
+                fD_BudgetBasicsService.UpdateStatus(keyValue, Status);
+            }
+            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/ReceiveSendFeeManagement/FD_BudgetBasics/FD_BudgetBasicsEntity.cs

@@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("BREMARKS")]
         public string BRemarks { get; set; }
         /// <summary>
-        /// 状态 0草稿，1审批中，2已审批，3已拒绝
+        /// 状态 0草稿，1审批中，2已审批，3调整草稿，4调整进行中，5已调整
         /// </summary>
         [Column("BSTATUS")]
         public int? BStatus { get; set; }
@@ -69,6 +69,16 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         [Column("BDELETEUSER")]
         public string BDeleteUser { get; set; }
+        /// <summary>
+        /// 调整时间
+        /// </summary>
+        [Column("ADJUSTTIME")]
+        public DateTime? AdjustTime { get; set; }
+        /// <summary>
+        /// 调整人
+        /// </summary>
+        [Column("ADJUSTUSERID")]
+        public string AdjustUserId { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_BudgetBasics/FD_BudgetBasicsIBLL.cs

@@ -50,6 +50,13 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         void SaveEntity(string keyValue, FD_BudgetBasicsEntity entity);
 
         void ChangeStatusById(string keyValue, int status, string processId);
+
+        /// <summary>
+        /// 更新状态
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="Status"></param>
+        void UpdateStatus(string keyValue, int Status);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_BudgetBasics/FD_BudgetBasicsService.cs

@@ -30,14 +30,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.BId,
-                t.BName,
-                t.BDept,
-                t.BCreateTime,
-                t.BRemarks,t.BStatus,t.BProcessId
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM FD_BudgetBasics t ");
                 strSql.Append("  WHERE 1=1  and BIsDelete=0 ");
                 var queryParam = queryJson.ToJObject();
@@ -49,6 +42,10 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
                     strSql.Append(" AND ( t.BCreateTime >= @startTime AND t.BCreateTime <= @endTime ) ");
                 }
+                if (!queryParam["SqlParameter"].IsEmpty())
+                {
+                    strSql.Append(queryParam["SqlParameter"].ToString());
+                }
                 return this.BaseRepository("CollegeMIS").FindList<FD_BudgetBasicsEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -189,6 +186,32 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 throw ExceptionEx.ThrowServiceException(ex);
             }
         }
+
+        /// <summary>
+        /// 更新状态
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="Status"></param>
+        public void UpdateStatus(string keyValue, int Status)
+        {
+            try
+            {
+                string sql = $" update FD_BudgetBasics set BStatus='{Status}' where BId='{keyValue}'";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }