【修改】年度缴费管理：列表增加学籍状态、学生状态列；增加是否作废列；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/Index.cshtml

@@ -21,13 +21,13 @@
                             <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"/>
+                                    <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="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
@@ -43,6 +43,14 @@
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生状态</div>
+                                    <div id="STU_STATE_CODE"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学籍状态</div>
+                                    <div id="STU_ROLL_CODE"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -24,11 +24,13 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 250, 400);
+            }, 350, 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' });
+            $('#STU_STATE_CODE').lrDataItemSelect({ code: 'StuStateCode' });
+            $('#STU_ROLL_CODE').lrDataItemSelect({ code: 'StuRollCode' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -180,6 +182,38 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    {
+                        label: "是否作废", name: "itemCount", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == row.itemdelCount) {
+                                return '<span class=\"label label-warning\">作废</span>';
+                            } else {
+                                return '<span class=\"label label-success\">正常</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "学生状态", name: "STU_STATE_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuStateCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学籍状态", name: "STU_ROLL_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuRollCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'FSYId',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml

@@ -29,7 +29,7 @@
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">缴费年度</div>
                                     <div id="FSYear"></div>
-                                </div>  
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">缴费状态</div>
                                     <div id="PayFeeStatus"></div>
@@ -46,6 +46,14 @@
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生状态</div>
+                                    <div id="STU_STATE_CODE"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学籍状态</div>
+                                    <div id="STU_ROLL_CODE"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -20,7 +20,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 380, 400);
             $('#FSYear').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GenerateNearByYear',
                 value: 'value',
@@ -33,6 +33,8 @@ var bootstrap = function ($, learun) {
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#PayFeeStatus').lrDataItemSelect({ code: 'PayStatus' });
             $('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' });
+            $('#STU_STATE_CODE').lrDataItemSelect({ code: 'StuStateCode' });
+            $('#STU_ROLL_CODE').lrDataItemSelect({ code: 'StuRollCode' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -183,7 +185,29 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-success\">正常</span>';
                             }
                         }
-                    }
+                    },
+                    {
+                        label: "学生状态", name: "STU_STATE_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuStateCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学籍状态", name: "STU_ROLL_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuRollCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'FSYIId',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStudent/Index.cshtml

@@ -18,7 +18,7 @@
                                     <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="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
@@ -34,6 +34,14 @@
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学生状态</div>
+                                    <div id="STU_STATE_CODE"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学籍状态</div>
+                                    <div id="STU_ROLL_CODE"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -15,10 +15,12 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 250, 400);
+            }, 350, 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' });
+            $('#STU_STATE_CODE').lrDataItemSelect({ code: 'StuStateCode' });
+            $('#STU_ROLL_CODE').lrDataItemSelect({ code: 'StuRollCode' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -172,6 +174,28 @@ var bootstrap = function ($, learun) {
                             return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
                     },
+                    {
+                        label: "学生状态", name: "STU_STATE_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuStateCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学籍状态", name: "STU_ROLL_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuRollCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                 ],
                 mainId: 'FSId',
                 isMultiselect: true,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearEntity.cs

@@ -92,6 +92,26 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         public decimal? PayMoney { get; set; }
         [NotMapped]
         public string orderid { get; set; }
+        /// <summary>
+        /// 中间库对接的学生状态
+        /// </summary>
+        [NotMapped]
+        public string STU_STATE_CODE { get; set; }
+        /// <summary>
+        /// 中间库对接的学籍状态
+        /// </summary>
+        [NotMapped]
+        public string STU_ROLL_CODE { get; set; }
+        /// <summary>
+        /// FinaChargeStuYearItem明细数量
+        /// </summary>
+        [NotMapped]
+        public int itemCount { get; set; }
+        /// <summary>
+        /// FinaChargeStuYearItem明细作废的数量
+        /// </summary>
+        [NotMapped]
+        public int itemdelCount { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYear/FinaChargeStuYearService.cs

@@ -33,8 +33,10 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.*,b.DeptNo,b.MajorNo,b.ClassNo,b.Grade,b.IdentityCardNo,b.StuName,b.GenderNo ");
-                strSql.Append("  FROM FinaChargeStuYear t left join FinaChargeStudent b on t.StuNo=b.StuNo ");
+                strSql.Append("SELECT t.*,b.DeptNo,b.MajorNo,b.ClassNo,b.Grade,b.IdentityCardNo,b.StuName,b.GenderNo,sb.STU_STATE_CODE,sb.STU_ROLL_CODE ");
+                strSql.Append(" ,(select count(i.FSYIId) from FinaChargeStuYearItem i where i.FSYId=t.FSYId) as itemCount ");
+                strSql.Append(" ,(select count(i.FSYIId) from FinaChargeStuYearItem i where i.FSYId=t.FSYId and i.F_DeleteMark=1) as itemdelCount ");
+                strSql.Append("  FROM FinaChargeStuYear t left join FinaChargeStudent b on t.StuNo=b.StuNo left join StuInfoBasic sb on t.StuNo=sb.StuNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -84,6 +86,16 @@ 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["STU_STATE_CODE"].IsEmpty())
+                {
+                    dp.Add("STU_STATE_CODE", queryParam["STU_STATE_CODE"].ToString(), DbType.String);
+                    strSql.Append(" AND sb.STU_STATE_CODE = @STU_STATE_CODE ");
+                }
+                if (!queryParam["STU_ROLL_CODE"].IsEmpty())
+                {
+                    dp.Add("STU_ROLL_CODE", queryParam["STU_ROLL_CODE"].ToString(), DbType.String);
+                    strSql.Append(" AND sb.STU_ROLL_CODE = @STU_ROLL_CODE ");
+                }
                 if (!queryParam["Teacher"].IsEmpty())
                 {
                     var userinfo = LoginUserInfo.Get();
@@ -257,7 +269,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             var entity = innerDataobj.entity;
             var userInfo = innerDataobj.userInfo;
             //获取缴费学生
-            var stulist = BaseRepository("CollegeMIS").FindList<FinaChargeStudentEntity>(m => m.F_CheckMark == true);
+            var stulist = BaseRepository("CollegeMIS").FindList<FinaChargeStudentEntity>("select t.* from FinaChargeStudent t left join StuInfoBasic s on t.StuNo=s.StuNo where t.F_CheckMark=1 and s.STU_STATE_CODE in ('01','04','05') and s.STU_ROLL_CODE in ('1')");
             //获取已有年度学生缴费记录
             var oldFinaChargeStuYearList = BaseRepository("CollegeMIS").FindList<FinaChargeStuYearEntity>(m => m.FSYear == entity.FSYear);
             //获取已有年度学生缴费明细记录

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs

@@ -135,6 +135,16 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         public string ClassNo { get; set; }
         [NotMapped]
         public string DeptNo { get; set; }
+        /// <summary>
+        /// 中间库对接的学生状态
+        /// </summary>
+        [NotMapped]
+        public string STU_STATE_CODE { get; set; }
+        /// <summary>
+        /// 中间库对接的学籍状态
+        /// </summary>
+        [NotMapped]
+        public string STU_ROLL_CODE { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs

@@ -35,8 +35,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                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("SELECT t.*,b.StuNo,b.StuName,b.MajorNo,b.ClassNo,b.DeptNo,b.IdentityCardNo,sb.STU_STATE_CODE,sb.STU_ROLL_CODE ");
+                strSql.Append("  FROM FinaChargeStuYearItem t left join FinaChargeStuYear a on t.FSYId=a.FSYId left join FinaChargeStudent b on a.StuNo=b.StuNo left join StuInfoBasic sb on a.StuNo=sb.StuNo ");
                 strSql.Append("  WHERE 1=1 and b.F_CheckMark=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -90,6 +90,21 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 {
                     strSql.Append(" AND (t.FSBlance>0 or RefundStatus=1) ");
                 }
+                if (!queryParam["PayFeeStatus"].IsEmpty())
+                {
+                    dp.Add("PayFeeStatus", queryParam["PayFeeStatus"].ToString(), DbType.String);
+                    strSql.Append(" AND t.PayFeeStatus = @PayFeeStatus ");
+                }
+                if (!queryParam["STU_STATE_CODE"].IsEmpty())
+                {
+                    dp.Add("STU_STATE_CODE", queryParam["STU_STATE_CODE"].ToString(), DbType.String);
+                    strSql.Append(" AND sb.STU_STATE_CODE = @STU_STATE_CODE ");
+                }
+                if (!queryParam["STU_ROLL_CODE"].IsEmpty())
+                {
+                    dp.Add("STU_ROLL_CODE", queryParam["STU_ROLL_CODE"].ToString(), DbType.String);
+                    strSql.Append(" AND sb.STU_ROLL_CODE = @STU_ROLL_CODE ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuYearItemEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStudent/FinaChargeStudentEntity.cs

@@ -95,6 +95,16 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         }
         #endregion
         #region 扩展字段
+        /// <summary>
+        /// 中间库对接的学生状态
+        /// </summary>
+        [NotMapped]
+        public string STU_STATE_CODE { get; set; }
+        /// <summary>
+        /// 中间库对接的学籍状态
+        /// </summary>
+        [NotMapped]
+        public string STU_ROLL_CODE { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStudent/FinaChargeStudentService.cs

@@ -30,8 +30,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT  * ");
-                strSql.Append("  FROM FinaChargeStudent t ");
+                strSql.Append("SELECT  t.*,sb.STU_STATE_CODE,sb.STU_ROLL_CODE ");
+                strSql.Append("  FROM FinaChargeStudent t left join StuInfoBasic sb on t.StuNo=sb.StuNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -66,6 +66,16 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.ClassNo = @ClassNo ");
                 }
+                if (!queryParam["STU_STATE_CODE"].IsEmpty())
+                {
+                    dp.Add("STU_STATE_CODE", queryParam["STU_STATE_CODE"].ToString(), DbType.String);
+                    strSql.Append(" AND sb.STU_STATE_CODE = @STU_STATE_CODE ");
+                }
+                if (!queryParam["STU_ROLL_CODE"].IsEmpty())
+                {
+                    dp.Add("STU_ROLL_CODE", queryParam["STU_ROLL_CODE"].ToString(), DbType.String);
+                    strSql.Append(" AND sb.STU_ROLL_CODE = @STU_ROLL_CODE ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<FinaChargeStudentEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)