diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js
index 97a21822b..d26a88866 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js
@@ -5,6 +5,7 @@
* 描 述:FinaChargeStuYearItem
*/
var refreshGirdData;
+var sYear;
var bootstrap = function ($, learun) {
"use strict";
var page = {
@@ -13,6 +14,18 @@ var bootstrap = function ($, learun) {
page.bind();
},
bind: function () {
+ $('#SYear').lrselect({
+ url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear',
+ value: 'value',
+ text: 'text'
+ });
+ var now = new Date();
+ sYear = now.getFullYear();
+ $('#SYear').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();
@@ -46,11 +59,11 @@ var bootstrap = function ($, learun) {
});
}
});
- // 删除
+ // 作废
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('FSYIId');
if (learun.checkrow(keyValue)) {
- learun.layerConfirm('是否确认删除该项!', function (res) {
+ learun.layerConfirm('是否确认作废该项!', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/DeleteForm', { keyValue: keyValue}, function () {
refreshGirdData();
@@ -62,9 +75,38 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
- $('#gridtable').lrAuthorizeJfGrid({
+ $('#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",
@@ -77,8 +119,9 @@ var bootstrap = function ($, learun) {
}
});
}},
- { label: "应缴金额", name: "Standard", width: 100, align: "left"},
- { label: "实缴金额", name: "SJAmount", width: 100, align: "left"},
+ { 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', {
@@ -88,7 +131,14 @@ var bootstrap = function ($, learun) {
callback(_data.text);
}
});
- }},
+ }
+ },
+ {
+ label: "是否作废", name: "F_DeleteMark", width: 100, align: "left",
+ formatter: function (cellvalue, rowObject) {
+ return cellvalue == "1" ? "" : "";
+ }
+ }
],
mainId:'FSYIId',
isPage: true
@@ -97,6 +147,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
+ param.SYear = sYear;
$('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearBLL.cs
index 77f38a98a..da155cf25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearBLL.cs
@@ -138,6 +138,41 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
}
}
+ public List GetTree()
+ {
+ try
+ {
+ var list = finaChargeStuYearService.GetYearList();
+ List treeList = new List();
+ foreach (var item in list)
+ {
+ TreeModel node = new TreeModel
+ {
+ id =item.FSYear.ToString(),
+ text = item.FSYear.ToString(),
+ value = item.FSYear.ToString(),
+ showcheck = false,
+ checkstate = 0,
+ isexpand = true,
+ parentId = ""
+ };
+ treeList.Add(node);
+ }
+ return treeList.ToTree();
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowBusinessException(ex);
+ }
+ }
+ }
+
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearEntity.cs
index 131e9c7cd..34594d136 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearEntity.cs
@@ -69,6 +69,18 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
}
#endregion
#region 扩展字段
+ [NotMapped]
+ public string DeptNo { get; set; }
+ [NotMapped]
+ public string MajorNo { get; set; }
+ [NotMapped]
+ public string ClassNo { get; set; }
+ [NotMapped]
+ public string Grade { get; set; }
+ [NotMapped]
+ public string IdentityCardNo { get; set; }
+ [NotMapped]
+ public string StuName { get; set; }
#endregion
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearIBLL.cs
index 4f6459214..0d396c4b1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearIBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearIBLL.cs
@@ -45,5 +45,6 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
#endregion
void SaveGenerateByCondition(FinaChargeStuYearEntity entity);
+ List GetTree();
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs
index e99969761..16f804bfc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs
@@ -31,30 +31,46 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(@"
- t.FSYId,
- t.StuNo,
- t.FSYear,
- t.YJAmount,
- t.SJAmount,
- t.FSBlance,
- t.PayFeeStatus
- ");
- strSql.Append(" FROM FinaChargeStuYear t ");
+ strSql.Append("SELECT t.*,b.DeptNo,b.MajorNo,b.ClassNo,b.Grade,b.IdentityCardNo,b.StuName ");
+ strSql.Append(" FROM FinaChargeStuYear t left join FinaChargeStudent b on t.StuNo=b.StuNo ");
strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!queryParam["StuNo"].IsEmpty())
{
- dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.StuNo Like @StuNo ");
+ dp.Add("StuNo", "" + queryParam["StuNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND b.StuNo = @StuNo ");
+ }
+ if (!queryParam["StuName"].IsEmpty())
+ {
+ dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+ strSql.Append(" AND b.StuName Like @StuName ");
+ }
+ if (!queryParam["DeptNo"].IsEmpty())
+ {
+ dp.Add("DeptNo", "" + queryParam["DeptNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND b.DeptNo = @DeptNo ");
+ }
+ if (!queryParam["MajorNo"].IsEmpty())
+ {
+ dp.Add("MajorNo", "" + queryParam["MajorNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND b.MajorNo = @MajorNo ");
+ }
+ if (!queryParam["ClassNo"].IsEmpty())
+ {
+ dp.Add("ClassNo", "" + queryParam["ClassNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND b.ClassNo = @ClassNo ");
+ }
+ if (!queryParam["IdentityCardNo"].IsEmpty())
+ {
+ dp.Add("IdentityCardNo", "" + queryParam["IdentityCardNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND b.IdentityCardNo = @IdentityCardNo ");
}
if (!queryParam["FSYear"].IsEmpty())
{
- dp.Add("FSYear", "%" + queryParam["FSYear"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.FSYear Like @FSYear ");
+ dp.Add("FSYear", "" + queryParam["FSYear"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.FSYear = @FSYear ");
}
if (!queryParam["PayFeeStatus"].IsEmpty())
{
@@ -265,5 +281,26 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
}
}
}
+
+ public IEnumerable GetYearList()
+ {
+ try
+ {
+ var strSql = new StringBuilder();
+ strSql.Append("select [FSYear] from [dbo].[FinaChargeStuYear] group by [FSYear] order by[FSYear] ");
+ return this.BaseRepository("CollegeMIS").FindList(strSql.ToString());
+ }
+ catch (Exception ex)
+ {
+ if (ex is ExceptionEx)
+ {
+ throw;
+ }
+ else
+ {
+ throw ExceptionEx.ThrowServiceException(ex);
+ }
+ }
+ }
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs
index abc4eee4c..572ecae6c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs
@@ -110,6 +110,16 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
}
#endregion
#region 扩展字段
+ [NotMapped]
+ public string StuNo { get; set; }
+ [NotMapped]
+ public string StuName { get; set; }
+ [NotMapped]
+ public string MajorNo { get; set; }
+ [NotMapped]
+ public string ClassNo { get; set; }
+ [NotMapped]
+ public string DeptNo { get; set; }
#endregion
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs
index 15156a791..b3b130db9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs
@@ -30,21 +30,47 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT ");
- strSql.Append(@"
- t.FSYIId,
- t.ChargeItemCode,
- t.ChargeItemName,
- t.ChargeItemType,
- t.Standard,
- t.SJAmount,
- t.PayFeeStatus
- ");
- strSql.Append(" FROM FinaChargeStuYearItem t ");
- strSql.Append(" WHERE 1=1 ");
+ strSql.Append("SELECT t.*,b.StuNo,b.StuName,b.MajorNo,b.ClassNo,b.DeptNo,b.IdentityCardNo ");
+ strSql.Append(" FROM FinaChargeStuYearItem t left join FinaChargeStuYear a on t.FSYId=a.FSYId left join FinaChargeStudent b on a.StuNo=b.StuNo ");
+ strSql.Append(" WHERE 1=1 and b.F_CheckMark=1 ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
+ if (!queryParam["StuNo"].IsEmpty())
+ {
+ dp.Add("StuNo", "" + queryParam["StuNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND b.StuNo = @StuNo ");
+ }
+ if (!queryParam["StuName"].IsEmpty())
+ {
+ dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+ strSql.Append(" AND b.StuName Like @StuName ");
+ }
+ if (!queryParam["MajorNo"].IsEmpty())
+ {
+ dp.Add("MajorNo", "" + queryParam["MajorNo"].ToString() + "", DbType.String);
+ strSql.Append(" AND b.MajorNo = @MajorNo ");
+ }
+ if (!queryParam["FSYear"].IsEmpty())
+ {
+ dp.Add("FSYear", "" + queryParam["FSYear"].ToString() + "", DbType.String);
+ strSql.Append(" AND a.FSYear = @FSYear ");
+ }
+ if (!queryParam["ChargeItemCode"].IsEmpty())
+ {
+ dp.Add("ChargeItemCode", "%" + queryParam["ChargeItemCode"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.ChargeItemCode Like @ChargeItemCode ");
+ }
+ if (!queryParam["ChargeItemName"].IsEmpty())
+ {
+ dp.Add("ChargeItemName", "%" + queryParam["ChargeItemName"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.ChargeItemName Like @ChargeItemName ");
+ }
+ if (!queryParam["ChargeItemType"].IsEmpty())
+ {
+ dp.Add("ChargeItemType", "" + queryParam["ChargeItemType"].ToString() + "", DbType.String);
+ strSql.Append(" AND t.ChargeItemType = @ChargeItemType ");
+ }
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination);
}
catch (Exception ex)