生成年度缴费数据

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

@@ -117,6 +117,16 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
             }
             return Success("保存成功！");
         }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveGenerateByCondition(string strEntity)
+        {
+            FinaChargeStuYearEntity entity = strEntity.ToObject<FinaChargeStuYearEntity>();
+            finaChargeStuYearIBLL.SaveGenerateByCondition(entity);
+            return Success("生成成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/收费明细管理Controller.cs → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeStuYearItemController.cs

@@ -13,9 +13,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
     /// 日 期：2023-08-07 16:40
     /// 描 述：FinaChargeStuYearItem
     /// </summary>
-    public class 收费明细管理Controller : MvcControllerBase
+    public class FinaChargeStuYearItemController : MvcControllerBase
     {
-        private 收费明细管理IBLL 收费明细管理IBLL = new 收费明细管理BLL();
+        private FinaChargeStuYearItemIBLL finaChargeStuYearItemIBLL = new FinaChargeStuYearItemBLL();
 
         #region 视图功能
 
@@ -52,7 +52,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = 收费明细管理IBLL.GetPageList(paginationobj, queryJson);
+            var data = finaChargeStuYearItemIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -71,7 +71,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var FinaChargeStuYearItemData = 收费明细管理IBLL.GetFinaChargeStuYearItemEntity( keyValue );
+            var FinaChargeStuYearItemData = finaChargeStuYearItemIBLL.GetFinaChargeStuYearItemEntity( keyValue );
             var jsonData = new {
                 FinaChargeStuYearItem = FinaChargeStuYearItemData,
             };
@@ -90,7 +90,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            收费明细管理IBLL.DeleteEntity(keyValue);
+            finaChargeStuYearItemIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
         /// <summary>
@@ -105,7 +105,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             FinaChargeStuYearItemEntity entity = strEntity.ToObject<FinaChargeStuYearItemEntity>();
-            收费明细管理IBLL.SaveEntity(keyValue,entity);
+            finaChargeStuYearItemIBLL.SaveEntity(keyValue,entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

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

@@ -234,7 +234,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
                 return Fail("收费标准不存在！");
             }
             //判断某专业收费标准是否已使用
-            var isCharge = finaChargesStandardIBLL.IsChargeByMajorNo(entity.DeptNo,entity.MajorNo, entity.SYear,  entity.Grade);
+            var isCharge = finaChargesStandardIBLL.IsChargeByMajorNo(entity.DeptNo,entity.MajorNo, entity.SYear.ToString(),  entity.Grade);
             if (isCharge)
             {
                 return Fail("该信息正在被系统使用，不能删除！");

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

@@ -8,24 +8,7 @@
         <div id="FSYear" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title">缴费项目类型<font face="宋体">*</font></div>
-        <div id="ChargeItemType" isvalid="yes" checkexpession="NotNull"></div>
-    </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="Grade"></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>
 @Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYear/GenerateByConditionForm.js")

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

@@ -5,6 +5,7 @@
  * 描  述：按条件清空排课数据
  */
 var acceptClick;
+var sDeptNo, sMajorNo, sGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -18,83 +19,7 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             var now = new Date();
-            $('#PayYear').lrselectSet(now.getFullYear());
-            $('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' });
-            $('#DeptNo').lrselect({
-                value: "deptno",
-                text: "deptname",
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
-                select: function (item) {
-                    if (item) {
-                        $('#MajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
-                        });
-                    }
-                    else {
-                        $('#MajorNo').lrselectRefresh({
-                            url: "",
-                            data: []
-                        });
-                    }
-                    $('#ClassNo').lrselectRefresh({
-                        url: "",
-                        data: []
-                    });
-                }
-            });
-            $('#MajorNo').lrselect({
-                value: "majorno",
-                text: "majorname",
-                select: function (item) {
-                    if (item) {
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
-                        });
-                    }
-
-                }
-            });
-
-
-            $('#MajorNo').on("click",
-                function () {
-                    var data = $('#DeptNo').lrselectGet();
-                    if (!data) {
-                        learun.alert.error('请先选择系');
-                    }
-                });
-            $('#Grade').lrselect({
-                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
-                value: 'value',
-                text: 'text',
-                select: function (item) {
-                    if (item) {
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "grade='" + item.value + "'" }
-                        });
-                    }
-
-                }
-            });
-            $('#ClassNo').lrselect({
-                value: "classno",
-                text: "classname"
-            });
-            $('#ClassNo').on("click",
-                function () {
-                    var data1 = $('#DeptNo').lrselectGet();
-                    var data2 = $('#MajorNo').lrselectGet();
-                    var data3 = $('#Grade').lrselectGet();
-                    if (!data1 || !data2&&!data3) {
-                        learun.alert.error('请先选择系和专业或年级');
-                    }
-                    if ((!data1 || !data2) && data3) {
-                        learun.alert.error('请先选择年级');
-                    }
-                });
+            $('#FSYear').lrselectSet(now.getFullYear());
         }
     };
     // 保存数据
@@ -102,8 +27,10 @@ var bootstrap = function ($, learun) {
         if (!$('#form').lrValidform()) {
             return false;
         }
-        var postData = $('#form').lrGetFormData();
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/AsyncModifyArrangeLessonDataByCondition', postData, function (res) {
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYear/SaveGenerateByCondition', postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

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

@@ -36,8 +36,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '生成缴费信息',
                     url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYear/GenerateByConditionForm',
-                    width: 600,
-                    height: 400,
+                    width: 400,
+                    height: 200,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/收费明细管理/Form.cshtml → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Form.cshtml

@@ -28,4 +28,4 @@
         <div id="PayFeeStatus"  ></div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/收费明细管理/Form.js")
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/收费明细管理/Form.js → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Form.js

@@ -20,7 +20,7 @@ var bootstrap = function ($, learun) {
         },
         initData: function () {
             if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/收费明细管理/GetFormData?keyValue=' + keyValue, function (data) {
+                $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
                             $('#' + id ).jfGridSet('refreshdata', data[id]);
@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };
-        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/收费明细管理/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/收费明细管理/Index.cshtml → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.cshtml

@@ -23,4 +23,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/收费明细管理/Index.js")
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/收费明细管理/Index.js → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/Index.js

@@ -22,7 +22,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/收费明细管理/Form',
+                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/Form',
                     width: 600,
                     height: 400,
                     callBack: function (id) {
@@ -37,7 +37,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/收费明细管理/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/Form?keyValue=' + keyValue,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
@@ -52,7 +52,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/收费明细管理/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/DeleteForm', { keyValue: keyValue}, function () {
                                 refreshGirdData();
                             });
                         }
@@ -63,7 +63,7 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/ReceiveSendFeeManagement/收费明细管理/GetPageList',
+                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuYearItem/GetPageList',
                 headData: [
                     { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left"},
                     { label: "收费项名称", name: "ChargeItemName", width: 100, align: "left"},

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

@@ -146,6 +146,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" },
                     {

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

@@ -891,7 +891,7 @@
     <Compile Include="Areas\StuPayManage\Controllers\SP_LogController.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FinaChargeStudentController.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FinaChargeStuYearController.cs" />
-    <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\收费明细管理Controller.cs" />
+    <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FinaChargeStuYearItemController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6658,10 +6658,10 @@
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\Form.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYear\Form.js" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\收费明细管理\Index.cshtml" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\收费明细管理\Index.js" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\收费明细管理\Form.cshtml" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\收费明细管理\Form.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\Index.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\Index.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\Form.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuYearItem\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\AwardAndPunishment\" />

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

@@ -74,7 +74,7 @@
 	<!--Redis 缓存前缀 -->
 	<!--<add key="RedisPrev" value="adms706" />-->
 	<!--缓存链接配置-->
-	<add key="RedisExchangeHosts" value="127.0.0.1:6380,allowadmin=true"/>
+	<add key="RedisExchangeHosts" value="127.0.0.1:6379,allowadmin=true"/>
 
 	<!--head 头像存储地址 -->
 	<add key="fileHeadImg" value="E:\西昌程序单校区版2019_09_16\Learun.Framework.Ultimate V7\Learun.Application.Web\bin\Release\Publish\Content\images\head" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs

@@ -687,7 +687,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 if (classInfo != null)
                 {
                     teacherInfo = this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(a => a.EmpNo == classInfo.ClassDiredctorNo);
-                    result = this.BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>(a => a.Grade == classInfo.Grade && a.MajorNo == stuEnroll.MajorNo && a.SYear == yearAndSemester.AcademicYearShort )
+                    result = this.BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>(a => a.Grade == classInfo.Grade && a.MajorNo == stuEnroll.MajorNo && a.SYear ==Convert.ToInt32(yearAndSemester.AcademicYearShort ))
                                         .Select(a => new StuPayInfo
                                         {
                                             standerid = a.ChargeItemID,
@@ -1765,7 +1765,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var result = new List<StuPayInfo>();
                     if (classInfo != null)
                     {
-                        result = this.BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>(a => a.Grade == classInfo.Grade && a.MajorNo == stuEnroll.MajorNo && a.SYear == yearAndSemester.AcademicYearShort)
+                        result = this.BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>(a => a.Grade == classInfo.Grade && a.MajorNo == stuEnroll.MajorNo && a.SYear ==Convert.ToInt32(yearAndSemester.AcademicYearShort))
                                             .Select(a => new StuPayInfo
                                             {
                                                 standerid = a.ChargeItemID,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1842,10 +1842,10 @@
     <Compile Include="ReceiveSendFeeManagement\FinaChargeStuYear\FinaChargeStuYearService.cs" />
     <Compile Include="ReceiveSendFeeManagement\FinaChargeStuYear\FinaChargeStuYearBLL.cs" />
     <Compile Include="ReceiveSendFeeManagement\FinaChargeStuYear\FinaChargeStuYearIBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\收费明细管理\FinaChargeStuYearItemEntity.cs" />
-    <Compile Include="ReceiveSendFeeManagement\收费明细管理\收费明细管理Service.cs" />
-    <Compile Include="ReceiveSendFeeManagement\收费明细管理\收费明细管理BLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\收费明细管理\收费明细管理IBLL.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeStuYearItem\FinaChargeStuYearItemEntity.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeStuYearItem\FinaChargeStuYearItemService.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeStuYearItem\FinaChargeStuYearItemBLL.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeStuYearItem\FinaChargeStuYearItemIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

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

@@ -119,6 +119,25 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             }
         }
 
+        public void SaveGenerateByCondition(FinaChargeStuYearEntity entity)
+        {
+            try
+            {
+                finaChargeStuYearService.SaveGenerateByCondition(entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }

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

@@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("FSBLANCE")]
         public decimal? FSBlance { get; set; }
         /// <summary>
-        /// 缴费标志（0未缴费，1部分缴纳，2已缴清）
+        /// 缴费标志（0未缴费，1已缴清，4部分缴纳）
         /// </summary>
         [Column("PAYFEESTATUS")]
         public int? PayFeeStatus { get; set; }

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

@@ -44,5 +44,6 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         void SaveEntity(string keyValue, FinaChargeStuYearEntity entity);
         #endregion
 
+        void SaveGenerateByCondition(FinaChargeStuYearEntity entity);
     }
 }

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

@@ -4,6 +4,7 @@ using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
@@ -161,5 +162,47 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
 
         #endregion
 
+        public void SaveGenerateByCondition(FinaChargeStuYearEntity entity)
+        {
+            var db = BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                //获取缴费学生
+                var stulist= db.FindList<FinaChargeStudentEntity>(m=>m.F_CheckMark==true);
+                //获取收费标准
+                var finaChargesStandardList= db.FindList<FinaChargesStandardEntity>("select a.Grade,a.DeptNo,a.MajorNo,a.Standard,a.SYear,b.ChargeItemName,b.ChargeItemCode,b.ChargeItemType from [dbo].[FinaChargesStandard] a left join [dbo].[FinaChargeItem] b on a.ChargeItemID=b.[ChargeItemID]");
+                var finaChargesStandardListGroup = db.FindList<FinaChargesStandardEntity>(@"select a.Grade,a.DeptNo,a.MajorNo,sum(isnull(a.Standard,0)) as YJAmount,a.SYear
+                from[dbo].[FinaChargesStandard] a left join[dbo].[FinaChargeItem] b on a.ChargeItemID = b.[ChargeItemID]
+                group by a.Grade, a.DeptNo, a.MajorNo, a.SYear");
+                foreach (var stuitem in stulist)
+                {
+                    //写入学生年度缴费数据
+                    var finaChargeStuYear=new FinaChargeStuYearEntity();
+                    finaChargeStuYear.Create();
+                    finaChargeStuYear.StuNo = stuitem.StuNo;
+                    finaChargeStuYear.FSYear = entity.FSYear;
+                    finaChargeStuYear.YJAmount = finaChargesStandardListGroup.FirstOrDefault(m => m.DeptNo == stuitem.DeptNo && m.MajorNo == stuitem.MajorNo && m.Grade==stuitem.Grade)?.YJAmount;
+                    finaChargeStuYear.SJAmount = 0;
+                    finaChargeStuYear.FSBlance = 0;
+                    finaChargeStuYear.PayFeeStatus = 0;
+                    db.Insert(finaChargeStuYear);
+                    //写入年度缴费明细数据
+                    
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/收费明细管理/收费明细管理BLL.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemBLL.cs

@@ -12,9 +12,9 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     /// 日 期：2023-08-07 16:40
     /// 描 述：FinaChargeStuYearItem
     /// </summary>
-    public class 收费明细管理BLL : 收费明细管理IBLL
+    public class FinaChargeStuYearItemBLL : FinaChargeStuYearItemIBLL
     {
-        private 收费明细管理Service 收费明细管理Service = new 收费明细管理Service();
+        private FinaChargeStuYearItemService FinaChargeStuYearItemService = new FinaChargeStuYearItemService();
 
         #region 获取数据
 
@@ -28,7 +28,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                return 收费明细管理Service.GetPageList(pagination, queryJson);
+                return FinaChargeStuYearItemService.GetPageList(pagination, queryJson);
             }
             catch (Exception ex)
             {
@@ -52,7 +52,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                return 收费明细管理Service.GetFinaChargeStuYearItemEntity(keyValue);
+                return FinaChargeStuYearItemService.GetFinaChargeStuYearItemEntity(keyValue);
             }
             catch (Exception ex)
             {
@@ -79,7 +79,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                收费明细管理Service.DeleteEntity(keyValue);
+                FinaChargeStuYearItemService.DeleteEntity(keyValue);
             }
             catch (Exception ex)
             {
@@ -104,7 +104,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                收费明细管理Service.SaveEntity(keyValue, entity);
+                FinaChargeStuYearItemService.SaveEntity(keyValue, entity);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/收费明细管理/FinaChargeStuYearItemEntity.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemEntity.cs

@@ -55,7 +55,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("FSBLANCE")]
         public decimal? FSBlance { get; set; }
         /// <summary>
-        /// 缴费标志（0未缴费，1部分缴纳，2已缴清）
+        /// 缴费标志（0未缴费，1已缴清，4部分缴纳）
         /// </summary>
         [Column("PAYFEESTATUS")]
         public int? PayFeeStatus { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/收费明细管理/收费明细管理IBLL.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemIBLL.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     /// 日 期：2023-08-07 16:40
     /// 描 述：FinaChargeStuYearItem
     /// </summary>
-    public interface 收费明细管理IBLL
+    public interface FinaChargeStuYearItemIBLL
     {
         #region 获取数据
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/收费明细管理/收费明细管理Service.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs

@@ -15,7 +15,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     /// 日 期：2023-08-07 16:40
     /// 描 述：FinaChargeStuYearItem
     /// </summary>
-    public class 收费明细管理Service : RepositoryFactory
+    public class FinaChargeStuYearItemService : RepositoryFactory
     {
         #region 获取数据
 

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

@@ -54,6 +54,9 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         [Column("CLASSNO")]
         public string ClassNo { get; set; }
+
+        [Column("GRADE")]
+        public string Grade { get; set; }
         /// <summary>
         /// Mobile
         /// </summary>
@@ -64,6 +67,9 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         [Column("FSBLANCE")]
         public decimal? FSBlance { get; set; }
+
+        [Column("F_CHECKMARK")]
+        public bool? F_CheckMark { get; set; }
         #endregion
 
         #region 扩展操作

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

@@ -30,19 +30,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.FSId,
-                t.StuNo,
-                t.StuName,
-                t.GenderNo,
-                t.IdentityCardNo,
-                t.DeptNo,
-                t.MajorNo,
-                t.ClassNo,
-                t.Mobile,
-                t.FSBlance
-                ");
+                strSql.Append("SELECT  * ");
                 strSql.Append("  FROM FinaChargeStudent t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -243,8 +231,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").ExecuteBySql(@"insert into FinaChargeStudent(FSId, StuNo, StuName, GenderNo, IdentityCardNo, DeptNo, MajorNo, ClassNo, Mobile, FSBlance, F_CheckMark)
-                select newid(), stuno, stuname, genderno, identitycardno, deptno, majorno, classno, mobile, 0, 1 from StuInfoBasic a where a.checkmark = 1 and stuno not in(select stuno from FinaChargeStudent)");
+                this.BaseRepository("CollegeMIS").ExecuteBySql(@"insert into FinaChargeStudent(FSId, StuNo, StuName, GenderNo, IdentityCardNo, DeptNo, MajorNo, ClassNo,Grade, Mobile, FSBlance, F_CheckMark)
+                select newid(), stuno, stuname, genderno, identitycardno, deptno, majorno, classno,grade, mobile, 0, 1 from StuInfoBasic a where a.checkmark = 1 and stuno not in(select stuno from FinaChargeStudent)");
             }
             catch (Exception ex)
             {
@@ -263,7 +251,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").ExecuteBySql(@"update [FinaChargeStudent] set StuName=a.StuName,GenderNo=a.GenderNo,IdentityCardNo=a.IdentityCardNo,DeptNo=a.DeptNo, MajorNo=a.MajorNo, ClassNo=a.ClassNo, Mobile=a.Mobile
+                this.BaseRepository("CollegeMIS").ExecuteBySql(@"update [FinaChargeStudent] set StuName=a.StuName,GenderNo=a.GenderNo,IdentityCardNo=a.IdentityCardNo,DeptNo=a.DeptNo, MajorNo=a.MajorNo, ClassNo=a.ClassNo,Grade=a.Grade, Mobile=a.Mobile
 from StuInfoBasic a left join [FinaChargeStudent] b on a.stuno=b.stuno");
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardEntity.cs

@@ -48,7 +48,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// SYear
         /// </summary>
         [Column("SYEAR")]
-        public string SYear { get; set; }
+        public int SYear { get; set; }
         /// <summary>
         /// CheckMark
         /// </summary>
@@ -87,7 +87,12 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// 已交金额
         /// </summary>
         [NotMapped]
-        public decimal? PayedMoney { get; set; }   
+        public decimal? PayedMoney { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [NotMapped]
+        public decimal? YJAmount { get; set; }
         /// <summary>
         /// 实缴金额
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargesStandard/FinaChargesStandardService.cs

@@ -365,7 +365,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                         DeptNo = deptNo,
                         MajorNo = majorNo,
                         Standard = item.Standard,
-                        SYear = sYear,
+                        SYear =Convert.ToInt32(sYear),
                         CheckMark = false
                     };
                     entity.Create();