bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

明细整合

西昌缴费二期
fzp 1 year ago
parent
0e4abe5e14
commit
0c5aaf31cb
23 changed files with 759 additions and 45 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs
  2. +15
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearItemController.cs
  3. +7
    -6
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStudentController.cs
  4. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargesStandardController.cs
  5. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml
  6. +21
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js
  7. +3
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrderDetail/Index.js
  8. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.cshtml
  9. +20
    -19
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.js
  10. +63
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.cshtml
  11. +141
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.js
  12. +3
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml
  13. +6
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js
  14. +66
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.cshtml
  15. +157
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.js
  16. +65
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForTeacher.cshtml
  17. +134
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForTeacher.js
  18. +10
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStudent/Index.js
  19. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
  20. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrderDetail/FinaChargeStuOrderDetailService.cs
  21. +7
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs
  22. +6
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs
  23. +14
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs

+ 7
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearController.cs View File

@@ -11,6 +11,7 @@ using System.Text;
using System.Web;
using Learun.Application.Base.SystemModule;
using Learun.Application.TwoDevelopment.EducationalAdministration;
using Learun.Util.Operat;
using Newtonsoft.Json;
using ThoughtWorks.QRCode.Codec;

@@ -39,6 +40,11 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
return View();
}
[HttpGet]
public ActionResult IndexForTeacher()
{
return View();
}

[HttpGet]
public ActionResult IndexForStudent()
@@ -191,7 +197,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
FinaChargeStuYearEntity entity = strEntity.ToObject<FinaChargeStuYearEntity>();
finaChargeStuYearIBLL.SaveGenerateByCondition(entity);
return Success("生成成功！");
return Success_FinaCharge("生成成功！", "学生年度缴费管理", OperationType.Create, "", "生成学生年度缴费数据成功");
}
#endregion



+ 15
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearItemController.cs View File

@@ -4,6 +4,7 @@ using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
using System.Web.Mvc;
using System.Collections.Generic;
using Learun.Application.Base.SystemModule;
using Learun.Util.Operat;

namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
@@ -30,6 +31,17 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
return View();
}
[HttpGet]
public ActionResult IndexForTeacher()
{
return View();
}

[HttpGet]
public ActionResult IndexForRefund()
{
return View();
}
/// <summary>
/// 表单页
/// <summary>
@@ -99,14 +111,14 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
public ActionResult DeleteForm(string keyValue)
{
finaChargeStuYearItemIBLL.DeleteEntity(keyValue);
return Success("操作成功！");
return Success_FinaCharge("作废成功！", "收费明细管理", OperationType.Delete, keyValue, "作废成功");
}
[HttpPost]
[AjaxOnly]
public ActionResult UnDeleteForm(string keyValue)
{
finaChargeStuYearItemIBLL.UnDeleteEntity(keyValue);
return Success("操作成功！");
return Success_FinaCharge("恢复成功！", "收费明细管理", OperationType.Create, keyValue, "恢复成功");
}
/// <summary>
/// 保存实体数据（新增、修改）
@@ -148,6 +160,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
Success = res.Split('|')[0],
Fail = res.Split('|')[1]
};
Success_FinaCharge("导入成功！", "收费明细管理", OperationType.Create, "", "导入收费明细成功:"+ res.Split('|')[0] + "条，失败:"+ res.Split('|')[1] + "条");
return JsonResult(data);
}
else


+ 7
- 6
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStudentController.cs View File

@@ -3,6 +3,7 @@ using System.Data;
using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
using System.Web.Mvc;
using System.Collections.Generic;
using Learun.Util.Operat;

namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
@@ -85,14 +86,14 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
public ActionResult Lock(string keyValue)
{
finaChargeStudentIBLL.Lock(keyValue);
return Success("审核成功！");
return Success_FinaCharge("审核成功！", "缴费学生信息", OperationType.Lock, keyValue,"审核成功");
}
[HttpPost]
[AjaxOnly]
public ActionResult UnLock(string keyValue)
{
finaChargeStudentIBLL.UnLock(keyValue);
return Success("去审核成功！");
return Success_FinaCharge("去审成功！", "缴费学生信息", OperationType.UnLock, keyValue, "去审成功");
}

[HttpPost]
@@ -100,7 +101,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
public ActionResult ImportForm()
{
finaChargeStudentIBLL.ImportForm();
return Success("导入成功！");
return Success_FinaCharge("导入成功！", "缴费学生信息", OperationType.Create, "", "导入学生信息成功");
}

[HttpPost]
@@ -108,7 +109,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
public ActionResult UpdateForm()
{
finaChargeStudentIBLL.UpdateForm();
return Success("更新成功！");
return Success_FinaCharge("更新成功！", "缴费学生信息", OperationType.Update, "", "更新学生信息成功");
}
/// <summary>
/// 删除实体数据
@@ -121,12 +122,12 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
//判断有无余额数据
var stuchargeinfo = finaChargeStudentIBLL.GetFinaChargeStudentEntity(keyValue);
if (stuchargeinfo.FSBlance!=0)
if (stuchargeinfo.FSBlance.HasValue&&stuchargeinfo.FSBlance!=0)
{
return Fail("本学生存在缴费数据，不能删除。请核对！");
}
finaChargeStudentIBLL.DeleteEntity(keyValue);
return Success("删除成功！");
return Success_FinaCharge("删除成功！", "缴费学生信息", OperationType.Delete, keyValue, "删除缴费学生");
}
/// <summary>
/// 保存实体数据（新增、修改）


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargesStandardController.cs View File

@@ -258,9 +258,8 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
{
var aa = strEntity.ToObject<List<FinaChargesStandardEntity>>();
var aaa = aa.Where(x => x.Standard.HasValue && x.Standard.Value > 0).ToList();

finaChargesStandardIBLL.SaveFinaChargesStandardList(deptno,majorNo, syear, grade, aaa);
return Success("保存成功！");
return Success_FinaCharge("保存成功！", "收费标准设置", OperationType.Update, majorNo, "专业" + majorNo + "年度" + syear + "年级" + grade+aaa.ToJson());
}

/// <summary>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.cshtml View File

@@ -47,6 +47,7 @@
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_import" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 导入</a>
<a id="lr_detail" class="btn btn-default"><i class="fa fa-reorder"></i>&nbsp; 查看明细</a>
</div>
</div>
</div>


+ 21
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrder/Index.js View File

@@ -55,15 +55,32 @@ var bootstrap = function ($, learun) {
//  导入
$('#lr_import').on('click', function () {
});
//明细
$('#lr_detail').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'detail',
title: "订单明细",
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuOrderDetail/Index?keyValue=' + keyValue,
width: 800,
height: 450,
btn: null,
end: function () {
refreshGirdData();
}
});
}
});
},
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuOrder/GetPageList',
headData: [
{ label: "缴费年度", name: "YearNo", width: 100, align: "left"},
{ label: "缴费年度", name: "YearNo", width: 80, align: "left"},
{ label: "学号", name: "StuNo", width: 100, align: "left"},
{ label: "订单编号", name: "orderid", width: 100, align: "left"},
{ label: "订单编号", name: "orderid", width: 150, align: "left"},
{ label: "应缴金额", name: "YJAmount", width: 100, align: "left"},
{ label: "实缴金额", name: "SJAmount", width: 100, align: "left"},
{ label: "待缴金额", name: "DJAmount", width: 100, align: "left"},
@@ -78,8 +95,8 @@ var bootstrap = function ($, learun) {
}
});
}},
{ label: "订单生成时间", name: "PlaceOrderTime", width: 100, align: "left"},
{ label: "付款时间", name: "PayTime", width: 100, align: "left"},
{ label: "订单生成时间", name: "PlaceOrderTime", width: 150, align: "left"},
{ label: "付款时间", name: "PayTime", width: 150, align: "left"},
{ label: "支付方式", name: "PayMode", width: 100, align: "left",
formatterAsync: function (callback, value, row, op,$cell) {
learun.clientdata.getAsync('dataItem', {


+ 3
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuOrderDetail/Index.js View File

@@ -5,6 +5,7 @@
* 描 述：FinaChargeStuOrderDetail
*/
var refreshGirdData;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
@@ -20,7 +21,7 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuOrderDetail/GetPageList',
headData: [
{ label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left"},
@@ -37,6 +38,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
param.FCSOId = keyValue;
$('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
}
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.cshtml View File

@@ -53,7 +53,7 @@
</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_detail" class="btn btn-default"><i class="fa fa-reorder"></i>&nbsp; 查看明细</a>
</div>
</div>
</div>


+ 20
- 19
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.js View File

@@ -33,6 +33,23 @@ var bootstrap = function ($, learun) {
$('#lr_refresh').on('click', function () {
location.reload();
});
//明细
$('#lr_detail').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('FSYId');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'detail',
title: "收费明细",
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/Index?keyValue=' + keyValue,
width: 1400,
height: 600,
btn: null,
end: function () {
refreshGirdData();
}
});
}
});
// 新增
$('#lr_add').on('click', function () {
learun.layerForm({
@@ -46,22 +63,6 @@ var bootstrap = function ($, learun) {
}
});
});
// 退费
$('#lr_edit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('FSYId');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'form',
title: '退费',
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYear/Form?keyValue=' + keyValue,
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
},
// 初始化列表
initGird: function () {
@@ -76,7 +77,7 @@ var bootstrap = function ($, learun) {
return cellvalue == true ? "男" : "女";
}
},
{ label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
{ label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
{
label: "系所", name: "DeptNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -116,11 +117,11 @@ var bootstrap = function ($, learun) {
});
}
},
{ label: "年级", name: "Grade", width: 100, align: "left" },
{ label: "年级", name: "Grade", width: 80, align: "left" },
{ label: "缴费年度", name: "FSYear", width: 100, align: "left" },
{ label: "应缴金额", name: "YJAmount", width: 100, align: "left" },
{ label: "实缴金额", name: "SJAmount", width: 100, align: "left" },
{ label: "缴费年度余额", name: "FSBlance", width: 100, align: "left" },
{ label: "缴费年度余额(负数代表欠缴)", name: "FSBlance", width: 180, align: "left" },
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatter: function (cellvalue, row) {


+ 63
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.cshtml View File

@@ -0,0 +1,63 @@
@{
ViewBag.Title = "学生年度缴费管理";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout lr-layout-left-center" id="lr_layout">
<div class="lr-layout-left">
<div class="lr-layout-wrap">
<div class="lr-layout-title lrlt ">缴费年度</div>
<div id="dataTree" class="lr-layout-body"></div>
</div>
</div>
<div class="lr-layout-center">
<div class="lr-layout-wrap ">
<div class="lr-layout-title">
<span id="titleinfo" class="lrlt">学生缴费信息</span>
</div>
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="multiple_condition_query">
<div class="lr-query-formcontent">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">学号</div>
<input id="StuNo" type="text" class="form-control"/>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">姓名</div>
<input id="StuName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">身份证号</div>
<input id="IdentityCardNo" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">系部</div>
<div id="DeptNo"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">专业</div>
<div id="MajorNo"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">班级</div>
<div id="ClassNo"></div>
</div>
</div>
</div>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm">
<a id="lr_detail" class="btn btn-default"><i class="fa fa-reorder"></i>&nbsp; 查看明细</a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.js")

+ 141
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/IndexForTeacher.js View File

@@ -0,0 +1,141 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2023-08-07 15:52
* 描 述：学生年度缴费管理
*/
var refreshGirdData;
var fSYear;
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.initGird();
page.bind();
},
bind: function () {
// 初始化左侧树形数据
$('#dataTree').lrtree({
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYear/GetYearTree',
nodeClick: function (item) {
fSYear = item.value;
page.search();
}
});
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 250, 400);
$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
$('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
$('#PayFeeStatus').lrDataItemSelect({ code: 'PayStatus' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
//明细
$('#lr_detail').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('FSYId');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'detail',
title: "收费明细",
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/IndexForTeacher?keyValue=' + keyValue,
width: 1400,
height: 600,
btn: null,
end: function () {
refreshGirdData();
}
});
}
});
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYear/GetPageList',
headData: [
{ label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "性别", name: "GenderNo", width: 80, align: "left",
formatter: function (cellvalue) {
return cellvalue == true ? "男" : "女";
}
},
{ label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
{
label: "系所", name: "DeptNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
key: value,
keyId: 'deptno',
callback: function (_data) {
callback(_data['deptname']);
}
});
}
},
{
label: "专业", name: "MajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: value,
keyId: 'majorno',
callback: function (_data) {
callback(_data['majorname']);
}
});
}
},
{
label: "班级", name: "ClassNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: value,
keyId: 'classno',
callback: function (_data) {
callback(_data['classname']);
}
});
}
},
{ label: "年级", name: "Grade", width: 80, align: "left" },
{ label: "缴费年度", name: "FSYear", width: 100, align: "left" },
{ label: "应缴金额", name: "YJAmount", width: 100, align: "left" },
{ label: "实缴金额", name: "SJAmount", width: 100, align: "left" },
{ label: "缴费年度余额(负数代表欠缴)", name: "FSBlance", width: 180, align: "left" },
{
label: "缴费状态", name: "PayFeeStatus", 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-success\">已缴费</span>';
} else {
return '<span class=\"label label-warning\">部分缴纳</span>';
}
}
},
],
mainId: 'FSYId',
isPage: true
});
page.search();
},
search: function (param) {
param = param || {};
param.fSYear = fSYear;
param.Teacher = 1;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 3
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml View File

@@ -55,9 +55,10 @@
<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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;导入</a>
<a id="lr_undelete" 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_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退费</a>
</div>
</div>
</div>


+ 6
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js View File

@@ -6,6 +6,7 @@
*/
var refreshGirdData;
var sYear;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
@@ -54,15 +55,15 @@ var bootstrap = function ($, learun) {
// 恢复
$('#lr_undelete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('FSYIId');
var ChargeItemType = $('#gridtable').jfGridValue('F_DeleteMark');
var F_DeleteMark = $('#gridtable').jfGridValue('F_DeleteMark').toString();
if (learun.checkrow(keyValue)) {
if (ChargeItemType.indexOf('1') != -1) {
if (F_DeleteMark.indexOf('false') != -1) {
learun.alert.error("包含未作废项目，不能恢复");
return;
}
learun.layerConfirm('是否确认恢复该项！', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/UnDeleteForm', { keyValue: keyValue }, function () {
learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/UnDeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -85,7 +86,7 @@ var bootstrap = function ($, learun) {
}
learun.layerConfirm('是否确认作废该项！', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/DeleteForm', { keyValue: keyValue }, function () {
learun.postForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -176,6 +177,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
param.FSYId = keyValue;
param.FSYear = $('#FSYear').lrselectGet();
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}


+ 66
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.cshtml View File

@@ -0,0 +1,66 @@
@{
ViewBag.Title = "FinaChargeStuYearItem";
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-6 lr-form-item">
<div class="lr-form-item-title">学号</div>
<input id="StuNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">姓名</div>
<input id="StuName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">项目名称</div>
<input id="ChargeItemName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">项目编号</div>
<input id="ChargeItemCode" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">缴费年度</div>
<div id="FSYear"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">退费状态</div>
<div id="RefundStatus"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">项目类型</div>
<div id="ChargeItemType"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">专业</div>
<div id="MajorNo"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">班级</div>
<div id="ClassNo"></div>
</div>
</div>
</div>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_refund" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退费</a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.js")

+ 157
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.js View File

@@ -0,0 +1,157 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2023-08-07 16:40
* 描 述：FinaChargeStuYearItem
*/
var refreshGirdData;
var sYear;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.bind();
setTimeout(function () {
page.initGird();
}, 500);//延迟

},
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 300, 400);
$('#FSYear').lrselect({
url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear',
value: 'value',
text: 'text'
});
var now = new Date();
sYear = now.getFullYear();
$('#FSYear').lrselectSet(sYear);
$('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
$('#RefundStatus').lrDataItemSelect({ code: 'RefundStatus' });
$('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
//退费
$('#lr_refund').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('FSYIId');
var RefundStatus = $('#gridtable').jfGridValue('RefundStatus').toString();
if (learun.checkrow(keyValue)) {
if (RefundStatus.indexOf('true') != -1) {
learun.alert.error("包含已退费项目，不能退费");
return;
}
learun.layerForm({
id: 'formrefund',
title: '退费',
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeItem/Form',
width: 600,
height: 400,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/GetPageList',
headData: [
{ label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "专业", name: "MajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: value,
keyId: 'majorno',
callback: function (_data) {
callback(_data['majorname']);
}
});
}
},
{
label: "班级", name: "ClassNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: value,
keyId: 'classno',
callback: function (_data) {
callback(_data['classname']);
}
});
}
},
{ label: "缴费年度", name: "FSYear", width: 100, align: "left" },
{ label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" },
{ label: "收费项名称", name: "ChargeItemName", width: 100, align: "left" },
{
label: "收费项目类型", name: "ChargeItemType", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'ChargeItemType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{ label: "收费标准", name: "Standard", width: 100, align: "left" },
{ label: "实缴金额", name: "SJAmount", width: 100, align: "left" },
{ label: "缴费余额", name: "FSBlance", width: 100, align: "left" },
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'PayStatus',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: "是否退费", name: "RefundStatus", width: 100, align: "left",
formatter: function (cellvalue, row) {
if (cellvalue ===true) {
return '<span class=\"label label-success\">已退费</span>';
} else{
return '<span class=\"label label-warning\">未退费</span>';
}
}
}
],
mainId: 'FSYIId',
isPage: true,
isMultiselect: true,
sidx:'MajorNo,ClassNo,StuNo,ChargeItemCode'
});
page.search();
},
search: function (param) {
param = param || {};
param.FSYId = keyValue;
param.PayFeeStatus = 1;
param.F_DeleteMark = 0;
param.Refund = 1;
param.FSYear = $('#FSYear').lrselectGet();
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 65
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForTeacher.cshtml View File

@@ -0,0 +1,65 @@
@{
ViewBag.Title = "FinaChargeStuYearItem";
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-6 lr-form-item">
<div class="lr-form-item-title">学号</div>
<input id="StuNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">姓名</div>
<input id="StuName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">项目名称</div>
<input id="ChargeItemName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">项目编号</div>
<input id="ChargeItemCode" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">缴费年度</div>
<div id="FSYear"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">缴费状态</div>
<div id="PayFeeStatus"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">项目类型</div>
<div id="ChargeItemType"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">专业</div>
<div id="MajorNo"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">班级</div>
<div id="ClassNo"></div>
</div>
</div>
</div>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForTeacher.js")

+ 134
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForTeacher.js View File

@@ -0,0 +1,134 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2023-08-07 16:40
* 描 述：FinaChargeStuYearItem
*/
var refreshGirdData;
var sYear;
var keyValue = request('keyValue');
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.bind();
setTimeout(function () {
page.initGird();
}, 500);//延迟

},
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 300, 400);
$('#FSYear').lrselect({
url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear',
value: 'value',
text: 'text'
});
var now = new Date();
sYear = now.getFullYear();
$('#FSYear').lrselectSet(sYear);
$('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
$('#PayFeeStatus').lrDataItemSelect({ code: 'PayStatus' });
$('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/GetPageList',
headData: [
{ label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "专业", name: "MajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: value,
keyId: 'majorno',
callback: function (_data) {
callback(_data['majorname']);
}
});
}
},
{
label: "班级", name: "ClassNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: value,
keyId: 'classno',
callback: function (_data) {
callback(_data['classname']);
}
});
}
},
{ label: "缴费年度", name: "FSYear", width: 100, align: "left" },
{ label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" },
{ label: "收费项名称", name: "ChargeItemName", width: 100, align: "left" },
{
label: "收费项目类型", name: "ChargeItemType", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'ChargeItemType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{ label: "收费标准", name: "Standard", width: 100, align: "left" },
{ label: "实缴金额", name: "SJAmount", width: 100, align: "left" },
{ label: "缴费余额", name: "FSBlance", width: 100, align: "left" },
{
label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'PayStatus',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: "是否作废", name: "F_DeleteMark", width: 100, align: "left",
formatter: function (cellvalue, row) {
if (cellvalue ===true) {
return '<span class=\"label label-warning\">作废</span>';
} else{
return '<span class=\"label label-success\">正常</span>';
}
}
}
],
mainId: 'FSYIId',
isPage: true,
isMultiselect: true,
sidx:'MajorNo,ClassNo,StuNo,ChargeItemCode'
});
page.search();
},
search: function (param) {
param = param || {};
param.FSYId = keyValue;
param.FSYear = $('#FSYear').lrselectGet();
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 10
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStudent/Index.js View File

@@ -47,6 +47,15 @@ var bootstrap = function ($, learun) {
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('FSId');
if (learun.checkrow(keyValue)) {
if (keyValue.indexOf(',') != -1) {
learun.alert.warning("只能选择一条记录进行删除！");
return;
}
var CheckMark = $('#gridtable').jfGridValue('F_CheckMark').toString();
if (CheckMark.indexOf('true') != -1) {
learun.alert.warning("选中记录中包含已审核项目！");
return;
}
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStudent/DeleteForm', { keyValue: keyValue }, function () {
@@ -148,7 +157,7 @@ var bootstrap = function ($, learun) {
},
{ label: "年级", name: "Grade", width: 80, align: "left" },
{ label: "手机号", name: "Mobile", width: 100, align: "left" },
{ label: "学生总余额", name: "FSBlance", width: 100, align: "left" },
{ label: "学生总余额(负数代表欠缴)", name: "FSBlance", width: 180, align: "left" },
{
label: "审核标志", name: "F_CheckMark", width: 80, align: "left", formatter: function (cellvalue, rowObject) {
return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj View File

@@ -1631,7 +1631,10 @@
<Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\FormView.js" />
<Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Index.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\Import.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\IndexForRefund.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\IndexForTeacher.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\GenerateByConditionForm.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\IndexForTeacher.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\IndexForStudent.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\InvoiceForm.js" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\PayFeeForm.js" />
@@ -7976,6 +7979,9 @@
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\IndexForStudent.cshtml" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\PayFeeForm.cshtml" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\InvoiceForm.cshtml" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\IndexForTeacher.cshtml" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\IndexForTeacher.cshtml" />
<Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\IndexForRefund.cshtml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Views\Login\Default-beifen.cshtml" />


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuOrderDetail/FinaChargeStuOrderDetailService.cs View File

@@ -45,6 +45,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!queryParam["FCSOId"].IsEmpty())
{
dp.Add("FCSOId", queryParam["FCSOId"].ToString(), DbType.String);
strSql.Append(" AND t.FCSOId = @FCSOId ");
}
return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuOrderDetailEntity>(strSql.ToString(),dp, pagination);
}
catch (Exception ex)


+ 7
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs View File

@@ -83,6 +83,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
dp.Add("F_CheckMark", queryParam["F_CheckMark"].ToString(), DbType.String);
strSql.Append(" AND b.F_CheckMark = @F_CheckMark ");
}
if (!queryParam["Teacher"].IsEmpty())
{
var userinfo = LoginUserInfo.Get();
strSql.Append(" and classno in(select classno from classinfo where ClassDiredctorNo='"+ userinfo.account+ "') ");
}
return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuYearEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
@@ -107,7 +112,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
{
try
{
return this.BaseRepository("CollegeMIS").FindEntity<FinaChargeStuYearEntity>("select b.*,a.FSYear,a.YJAmount,a.SJAmount,a.FSBlance,a.PayFeeStatus from FinaChargeStuYear a left join FinaChargeStudent b on a.StuNo=b.StuNo where a.FSYId='"+keyValue+"'",null);
return this.BaseRepository("CollegeMIS").FindEntity<FinaChargeStuYearEntity>("select b.*,a.FSYear,a.YJAmount,a.SJAmount,a.FSBlance,a.PayFeeStatus from FinaChargeStuYear a left join FinaChargeStudent b on a.StuNo=b.StuNo where a.FSYId='" + keyValue + "'", null);
}
catch (Exception ex)
{
@@ -131,7 +136,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
{
try
{
return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuYearItemEntity>("select a.StuNo,b.* from FinaChargeStuYear a left join FinaChargeStuYearItem b on a.FSYId=b.FSYId where b.F_DeleteMark=0 and b.FSBlance<0 and a.FSYId='"+keyValue+"' order by ChargeItemCode");
return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuYearItemEntity>("select a.StuNo,b.* from FinaChargeStuYear a left join FinaChargeStuYearItem b on a.FSYId=b.FSYId where b.F_DeleteMark=0 and b.FSBlance<0 and a.FSYId='" + keyValue + "' order by ChargeItemCode");
}
catch (Exception ex)
{


+ 6
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs View File

@@ -87,6 +87,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
/// </summary>
[Column("F_CREATEUSERNAME")]
public string F_CreateUserName { get; set; }
/// <summary>
/// 退费标志
/// </summary>
[Column("REFUNDSTATUS")]
public bool? RefundStatus { get; set; }
#endregion

#region 扩展操作
@@ -104,6 +109,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
FSBlance = 0;
this.F_CreateUserId = userInfo.userId;
this.F_CreateUserName = userInfo.realName;
RefundStatus = false;
}
/// <summary>
/// 编辑调用


+ 14
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs View File

@@ -76,6 +76,20 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
dp.Add("ChargeItemType", "" + queryParam["ChargeItemType"].ToString() + "", DbType.String);
strSql.Append(" AND t.ChargeItemType = @ChargeItemType ");
}
if (!queryParam["FSYId"].IsEmpty())
{
dp.Add("FSYId", "" + queryParam["FSYId"].ToString() + "", DbType.String);
strSql.Append(" AND t.FSYId = @FSYId ");
}
if (!queryParam["RefundStatus"].IsEmpty())
{
dp.Add("RefundStatus", "" + queryParam["RefundStatus"].ToString() + "", DbType.String);
strSql.Append(" AND t.RefundStatus = @RefundStatus ");
}
if (!queryParam["Refund"].IsEmpty())
{
strSql.Append(" AND (t.FSBlance>0 or RefundStatus=1) ");
}
return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuYearItemEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)


Write Preview
Loading…
Cancel
Save