调整优化

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

@@ -93,10 +93,10 @@ var bootstrap = function ($, learun) {
                     { label: "缴费年度", name: "YearNo", width: 80, align: "left"},
                     { label: "学号", name: "StuNo", 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"},
-                    { label: "超出余额", name: "NowBlance", width: 100, align: "left"},
+                    { label: "收费标准", name: "YJAmount", width: 100, align: "left"},
+                    { label: "缴费金额", name: "SJAmount", width: 100, align: "left"},
+                    { label: "应缴余额", name: "DJAmount", width: 100, align: "left"},
+                    { label: "超出应收额", name: "NowBlance", width: 100, align: "left"},
                     { label: "缴费状态", name: "Status", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('dataItem', {

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

@@ -26,10 +26,10 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left"},
                     { label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left"},
-                    { label: "应缴金额", name: "YJAmount", width: 100, align: "left"},
-                    { label: "实缴金额", name: "SJAmount", width: 100, align: "left"},
-                    { label: "待缴金额", name: "DJAmount", width: 100, align: "left"},
-                    { label: "超出余额", name: "NowBlance", width: 100, align: "left"},
+                    { label: "收费标准", name: "YJAmount", width: 100, align: "left"},
+                    { label: "缴费金额", name: "SJAmount", width: 100, align: "left"},
+                    { label: "应缴余额", name: "DJAmount", width: 100, align: "left"},
+                    { label: "超出应收额", name: "NowBlance", width: 100, align: "left"},
                 ],
                 mainId:'Id',
                 isPage: true

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

@@ -118,10 +118,11 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { 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: "FSYear", width: 80, align: "left" },
+                    { label: "收费标准", name: "YJAmount", width: 80, align: "left" },
+                    { label: "缴费金额", name: "SJAmount", width: 80, align: "left" },
+                    { label: "应缴余额", name: "NeedToPay", width: 80, align: "left" },
+                    { label: "超出应收额", name: "FSBlance", width: 80, align: "left" },
                     {
                         label: "缴费状态", name: "PayFeeStatus", width: 100, align: "left",
                         formatter: function (cellvalue, row) {

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

@@ -157,7 +157,8 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "年级", name: "Grade", width: 80, align: "left" },
                     { label: "手机号", name: "Mobile", width: 100, align: "left" },
-                    { label: "学生总余额(负数代表欠缴)", name: "FSBlance", width: 180, align: "left" },
+                    { label: "应缴余额", name: "NeedToPay", width: 80, align: "left" },
+                    { label: "超出应收额", name: "FSBlance", width: 80, 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>";

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

@@ -190,6 +190,8 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "专业编号", name: "MajorNo", width: 100, align: "left" },
                     { label: "专业名称", name: "MajorName", width: 200, align: "left" },
+                    { label: "缴费年度", name: "SYear", width: 80, align: "left" },
+                    { label: "年级", name: "Grade", width: 80, align: "left" },
                     { label: "收费项目名称", name: "ChargeItemName", width: 200, align: "left" },
                     { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" },
                     { label: "收费标准", name: "Standard", width: 100, align: "left" },

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

@@ -40,7 +40,12 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("SJAMOUNT")]
         public decimal? SJAmount { get; set; }
         /// <summary>
-        /// 缴费年度余额（剩余应缴金额）
+        /// 应缴余额
+        /// </summary>
+        [Column("NEEDTOPAY")]
+        public decimal? NeedToPay { get; set; }
+        /// <summary>
+        /// 超出应收额
         /// </summary>
         [Column("FSBLANCE")]
         public decimal? FSBlance { get; set; }

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

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
 
 namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
@@ -214,97 +215,150 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
 
         #endregion
 
+        public class InnerDataEntity
+        {
+            public FinaChargeStuYearEntity entity { get; set; }
+            public IEnumerable<FinaChargeStuYearEntity> oldFinaChargeStuYearList { get; set; }
+            public IEnumerable<FinaChargeStuYearItemEntity> oldFinaChargeStuYearItemList { get; set; }
+            public IEnumerable<FinaChargesStandardEntity> finaChargesStandardList { get; set; }
+            public IEnumerable<FinaChargesStandardEntity> finaChargesStandardListGroup { get; set; }
+            public FinaChargeStudentEntity stuitem { get; set; }
+        }
+
         public void SaveGenerateByCondition(FinaChargeStuYearEntity entity)
         {
-            var db = BaseRepository("CollegeMIS").BeginTrans();
             try
             {
                 //获取缴费学生
-                var stulist = db.FindList<FinaChargeStudentEntity>(m => m.F_CheckMark == true);
+                var stulist = BaseRepository("CollegeMIS").FindList<FinaChargeStudentEntity>(m => m.F_CheckMark == true);
                 //获取已有年度学生缴费记录
-                var oldFinaChargeStuYearList = db.FindList<FinaChargeStuYearEntity>(m => m.FSYear == entity.FSYear);
+                var oldFinaChargeStuYearList = BaseRepository("CollegeMIS").FindList<FinaChargeStuYearEntity>(m => m.FSYear == entity.FSYear);
                 //获取已有年度学生缴费明细记录
-                var oldFinaChargeStuYearItemList = db.FindList<FinaChargeStuYearItemEntity>(m => m.FSYear == entity.FSYear);
+                var oldFinaChargeStuYearItemList = BaseRepository("CollegeMIS").FindList<FinaChargeStuYearItemEntity>(m => m.FSYear == entity.FSYear);
                 //获取收费标准
-                var finaChargesStandardList = db.FindList<FinaChargesStandardEntity>("select a.Grade,a.DeptNo,a.MajorNo,a.Standard,a.SYear,b.ChargeItemName,b.ChargeItemCode,b.ChargeItemType,b.priority from [dbo].[FinaChargesStandard] a left join [dbo].[FinaChargeItem] b on a.ChargeItemID=b.[ChargeItemID] where b.ChargeItemType=1 and a.SYear='" + entity.FSYear + "' and a.F_DeleteMark=0 and a.CheckMark=1 and b.CheckMark=1 and b.F_DeleteMark=0");
-                var finaChargesStandardListGroup = db.FindList<FinaChargesStandardEntity>(@"select a.Grade,a.DeptNo,a.MajorNo,sum(isnull(a.Standard,0)) as YJAmount,a.SYear
+                var finaChargesStandardList = BaseRepository("CollegeMIS").FindList<FinaChargesStandardEntity>("select a.Grade,a.DeptNo,a.MajorNo,a.Standard,a.SYear,b.ChargeItemName,b.ChargeItemCode,b.ChargeItemType,b.priority from [dbo].[FinaChargesStandard] a left join [dbo].[FinaChargeItem] b on a.ChargeItemID=b.[ChargeItemID] where b.ChargeItemType=1 and a.SYear='" + entity.FSYear + "' and a.F_DeleteMark=0 and a.CheckMark=1 and b.CheckMark=1 and b.F_DeleteMark=0");
+                var finaChargesStandardListGroup = BaseRepository("CollegeMIS").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] where b.ChargeItemType=1 and a.SYear='" + entity.FSYear + "' and a.F_DeleteMark=0 and a.CheckMark=1 and b.CheckMark=1 and b.F_DeleteMark=0 group by a.Grade, a.DeptNo, a.MajorNo, a.SYear");
+                var innerDataEntity = new InnerDataEntity();
+                innerDataEntity.oldFinaChargeStuYearList = oldFinaChargeStuYearList;
+                innerDataEntity.oldFinaChargeStuYearItemList = oldFinaChargeStuYearItemList;
+                innerDataEntity.finaChargesStandardList = finaChargesStandardList;
+                innerDataEntity.finaChargesStandardListGroup = finaChargesStandardListGroup;
+                innerDataEntity.entity = entity;
+                //线程池优化生成速度
+                ThreadPool.SetMaxThreads(50, 50);
                 foreach (var stuitem in stulist)
                 {
-                    var studentchargestanderdlist = finaChargesStandardList.Where(m => m.MajorNo == stuitem.MajorNo && m.Grade == stuitem.Grade);
-                    //判断有无年度学生缴费数据
-                    if (oldFinaChargeStuYearList.Count(m => m.StuNo == stuitem.StuNo) > 0)
+                    innerDataEntity.stuitem = stuitem;
+                    ThreadPool.QueueUserWorkItem(GeneralInner, innerDataEntity);
+                }
+                int t1 = 0;
+                int t2 = 0;
+                while (t1 < 50)
+                {
+                    ThreadPool.GetAvailableThreads(out t1, out t2);
+                }
+                //更新学生缴费总表
+                BaseRepository("CollegeMIS").ExecuteBySql(@"update FinaChargeStudent set FSBlance=a.[FSBlance]
+ from (select isnull(sum([FSBlance]),0) as [FSBlance],StuNo from [FinaChargeStuYear] group by StuNo) a left join 
+ FinaChargeStudent b on a.stuno=b.stuno");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public void GeneralInner(object innerobject)
+        {
+            var db = BaseRepository("CollegeMIS").BeginTrans();
+            var innerDataEntity = innerobject as InnerDataEntity;
+            var stuitem = innerDataEntity.stuitem;
+            var finaChargesStandardList = innerDataEntity.finaChargesStandardList;
+            var oldFinaChargeStuYearList = innerDataEntity.oldFinaChargeStuYearList;
+            var oldFinaChargeStuYearItemList = innerDataEntity.oldFinaChargeStuYearItemList;
+            var entity = innerDataEntity.entity;
+            var finaChargesStandardListGroup = innerDataEntity.finaChargesStandardListGroup;
+            try
+            {
+                var studentchargestanderdlist = finaChargesStandardList.Where(m => m.MajorNo == stuitem.MajorNo && m.Grade == stuitem.Grade);
+                //判断有无年度学生缴费数据
+                if (oldFinaChargeStuYearList.Count(m => m.StuNo == stuitem.StuNo) > 0)
+                {
+                    var oldFinaChargeStuYearEntity = oldFinaChargeStuYearList.FirstOrDefault(m => m.StuNo == stuitem.StuNo);
+                    //查询明细并比对
+                    var oldFinaChargeStuYearItemListForStu = oldFinaChargeStuYearItemList.Where(m => m.FSYId == oldFinaChargeStuYearEntity.FSYId).Select(m => m.ChargeItemCode);
+                    string oldcodeitem = string.Join(",", oldFinaChargeStuYearItemListForStu);
+                    var needinsertchargeitem = studentchargestanderdlist.Where(m => !oldcodeitem.Contains(m.ChargeItemCode));
+                    foreach (var finaChargesStandardEntity in needinsertchargeitem)
+                    {
+                        var finaChargeStuYearItem = new FinaChargeStuYearItemEntity();
+                        finaChargeStuYearItem.Create();
+                        finaChargeStuYearItem.FSYId = oldFinaChargeStuYearEntity.FSYId;
+                        finaChargeStuYearItem.FSYear = entity.FSYear;
+                        finaChargeStuYearItem.ChargeItemCode = finaChargesStandardEntity.ChargeItemCode;
+                        finaChargeStuYearItem.ChargeItemName = finaChargesStandardEntity.ChargeItemName;
+                        finaChargeStuYearItem.ChargeItemType = finaChargesStandardEntity.ChargeItemType;
+                        finaChargeStuYearItem.priority = finaChargesStandardEntity.priority;
+                        finaChargeStuYearItem.Standard = finaChargesStandardEntity.Standard;
+                        finaChargeStuYearItem.NeedToPay = finaChargesStandardEntity.Standard;
+                        //主表应缴金额更新
+                        oldFinaChargeStuYearEntity.YJAmount += finaChargeStuYearItem.Standard;
+                        oldFinaChargeStuYearEntity.NeedToPay += finaChargeStuYearItem.Standard;
+                        db.Insert(finaChargeStuYearItem);
+                    }
+                    if (oldFinaChargeStuYearItemList.Where(m => m.FSYId == oldFinaChargeStuYearEntity.FSYId).Sum(m => m.SJAmount) > 0)
+                        oldFinaChargeStuYearEntity.PayFeeStatus = 4;
+                    else
+                    {
+                        oldFinaChargeStuYearEntity.PayFeeStatus = 0;
+                    }
+                    //年度学生缴费数据主表更新
+                    db.Update(oldFinaChargeStuYearEntity);
+
+                }
+                else
+                {
+                    if (studentchargestanderdlist.Count() > 0)
                     {
-                        var oldFinaChargeStuYearEntity = oldFinaChargeStuYearList.FirstOrDefault(m => m.StuNo == stuitem.StuNo);
-                        //查询明细并比对
-                        var oldFinaChargeStuYearItemListForStu = oldFinaChargeStuYearItemList.Where(m => m.FSYId == oldFinaChargeStuYearEntity.FSYId).Select(m => m.ChargeItemCode);
-                        string oldcodeitem = string.Join(",", oldFinaChargeStuYearItemListForStu);
-                        var needinsertchargeitem = studentchargestanderdlist.Where(m => !oldcodeitem.Contains(m.ChargeItemCode));
-                        foreach (var finaChargesStandardEntity in needinsertchargeitem)
+                        //写入学生年度缴费数据
+                        var finaChargeStuYear = new FinaChargeStuYearEntity();
+                        finaChargeStuYear.Create();
+                        finaChargeStuYear.StuNo = stuitem.StuNo;
+                        finaChargeStuYear.FSYear = entity.FSYear;
+                        finaChargeStuYear.SJAmount = 0;
+                        finaChargeStuYear.PayFeeStatus = 0;
+                        //写入年度缴费明细数据
+                        foreach (var finaChargesStandardEntity in studentchargestanderdlist)
                         {
                             var finaChargeStuYearItem = new FinaChargeStuYearItemEntity();
                             finaChargeStuYearItem.Create();
-                            finaChargeStuYearItem.FSYId = oldFinaChargeStuYearEntity.FSYId;
+                            finaChargeStuYearItem.FSYId = finaChargeStuYear.FSYId;
                             finaChargeStuYearItem.FSYear = entity.FSYear;
                             finaChargeStuYearItem.ChargeItemCode = finaChargesStandardEntity.ChargeItemCode;
                             finaChargeStuYearItem.ChargeItemName = finaChargesStandardEntity.ChargeItemName;
                             finaChargeStuYearItem.ChargeItemType = finaChargesStandardEntity.ChargeItemType;
                             finaChargeStuYearItem.priority = finaChargesStandardEntity.priority;
                             finaChargeStuYearItem.Standard = finaChargesStandardEntity.Standard;
-                            //主表应缴金额更新
-                            oldFinaChargeStuYearEntity.YJAmount += finaChargeStuYearItem.Standard;
-                            //余额扣减
-                            oldFinaChargeStuYearEntity.FSBlance -= finaChargeStuYearItem.Standard;
+                            finaChargeStuYearItem.NeedToPay = finaChargesStandardEntity.Standard;
+                            finaChargeStuYearItem.FSBlance = 0;
                             db.Insert(finaChargeStuYearItem);
                         }
-                        if (oldFinaChargeStuYearItemList.Where(m => m.FSYId == oldFinaChargeStuYearEntity.FSYId).Sum(m => m.SJAmount) > 0)
-                            oldFinaChargeStuYearEntity.PayFeeStatus = 4;
-                        else
-                        {
-                            oldFinaChargeStuYearEntity.PayFeeStatus = 0;
-                        }
-                        //年度学生缴费数据主表更新
-                        db.Update(oldFinaChargeStuYearEntity);
+                        finaChargeStuYear.YJAmount = finaChargesStandardListGroup.FirstOrDefault(m => m.DeptNo == stuitem.DeptNo && m.MajorNo == stuitem.MajorNo && m.Grade == stuitem.Grade)?.YJAmount;
+                        finaChargeStuYear.NeedToPay = finaChargeStuYear.YJAmount;
+                        finaChargeStuYear.FSBlance = 0;
 
-                    }
-                    else
-                    {
-                        if (studentchargestanderdlist.Count() > 0)
-                        {
-                            //写入学生年度缴费数据
-                            var finaChargeStuYear = new FinaChargeStuYearEntity();
-                            finaChargeStuYear.Create();
-                            finaChargeStuYear.StuNo = stuitem.StuNo;
-                            finaChargeStuYear.FSYear = entity.FSYear;
-                            finaChargeStuYear.SJAmount = 0;
-                            finaChargeStuYear.PayFeeStatus = 0;
-                            //写入年度缴费明细数据
-                            foreach (var finaChargesStandardEntity in studentchargestanderdlist)
-                            {
-                                var finaChargeStuYearItem = new FinaChargeStuYearItemEntity();
-                                finaChargeStuYearItem.Create();
-                                finaChargeStuYearItem.FSYId = finaChargeStuYear.FSYId;
-                                finaChargeStuYearItem.FSYear = entity.FSYear;
-                                finaChargeStuYearItem.ChargeItemCode = finaChargesStandardEntity.ChargeItemCode;
-                                finaChargeStuYearItem.ChargeItemName = finaChargesStandardEntity.ChargeItemName;
-                                finaChargeStuYearItem.ChargeItemType = finaChargesStandardEntity.ChargeItemType;
-                                finaChargeStuYearItem.priority = finaChargesStandardEntity.priority;
-                                finaChargeStuYearItem.Standard = finaChargesStandardEntity.Standard;
-                                finaChargeStuYearItem.FSBlance = -finaChargeStuYearItem.Standard;
-                                db.Insert(finaChargeStuYearItem);
-                            }
-                            finaChargeStuYear.YJAmount = finaChargesStandardListGroup.FirstOrDefault(m => m.DeptNo == stuitem.DeptNo && m.MajorNo == stuitem.MajorNo && m.Grade == stuitem.Grade)?.YJAmount;
-                            finaChargeStuYear.FSBlance = -finaChargeStuYear.YJAmount;
-
-                            db.Insert(finaChargeStuYear);
-                        }
+                        db.Insert(finaChargeStuYear);
                     }
                 }
                 db.Commit();
-                //更新学生缴费总表
-                BaseRepository("CollegeMIS").ExecuteBySql(@"update FinaChargeStudent set FSBlance=a.[FSBlance]
- from (select isnull(sum([FSBlance]),0) as [FSBlance],StuNo from [FinaChargeStuYear] group by StuNo) a left join 
- FinaChargeStudent b on a.stuno=b.stuno");
             }
             catch (Exception ex)
             {
@@ -318,6 +372,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
+            
+
         }
 
         public IEnumerable<FinaChargeStuYearEntity> GetYearList()

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

@@ -58,7 +58,12 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("SJAMOUNT")]
         public decimal? SJAmount { get; set; }
         /// <summary>
-        /// 缴费余额
+        /// 应缴余额
+        /// </summary>
+        [Column("NEEDTOPAY")]
+        public decimal? NeedToPay { get; set; }
+        /// <summary>
+        /// 超出应收额
         /// </summary>
         [Column("FSBLANCE")]
         public decimal? FSBlance { get; set; }
@@ -107,6 +112,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             SJAmount = 0;
             PayFeeStatus = 0;
             FSBlance = 0;
+            NeedToPay = 0;
             this.F_CreateUserId = userInfo.userId;
             this.F_CreateUserName = userInfo.realName;
             RefundStatus = false;

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

@@ -63,7 +63,12 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("MOBILE")]
         public string Mobile { get; set; }
         /// <summary>
-        /// 总余额
+        /// 应缴余额
+        /// </summary>
+        [Column("NEEDTOPAY")]
+        public decimal? NeedToPay { get; set; }
+        /// <summary>
+        /// 超出应收额
         /// </summary>
         [Column("FSBLANCE")]
         public decimal? FSBlance { get; set; }

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

@@ -231,8 +231,8 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                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)");
+                this.BaseRepository("CollegeMIS").ExecuteBySql(@"insert into FinaChargeStudent(FSId, StuNo, StuName, GenderNo, IdentityCardNo, DeptNo, MajorNo, ClassNo,Grade, Mobile,NeedToPay, FSBlance, F_CheckMark)
+                select newid(), stuno, stuname, genderno, identitycardno, deptno, majorno, classno,grade, mobile, 0,0, 1 from StuInfoBasic a where a.checkmark = 1 and stuno not in(select stuno from FinaChargeStudent)");
             }
             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 int SYear { get; set; }
+        public int? SYear { get; set; }
         /// <summary>
         /// 审核标志
         /// </summary>