新生年份按照新生级别导入

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -2243,6 +2243,11 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
                             {
                                 throw (new Exception("【金额】转换失败，必须为数字！"));
                             }
+                            //金额不能小于等于零
+                            if (dresult <= 0)
+                            {
+                                throw (new Exception("【金额】不能为零或小于零，必须为正数！"));
+                            }
                             //筛选不在标准代码表内的数据
                             //第五列是项目编码
                             if (typecodelist.Count(m => m.ProjectCode == dr[4].ToString()) == 0)
@@ -2277,7 +2282,7 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
                                     throw (new Exception("【学生年度缴费数据】不存在，请核对是否初始化缴费数据！"));
                                 }
                                 //已缴费的跳过
-                                if (stuinfobasicpayfeelist.Count(m => m.StuNo == dr[1].ToString() && m.PayYear == dr[0].ToInt() && m.PayStatus == 1) == 0)
+                                if (stuinfobasicpayfeelist.Count(m => m.StuNo == dr[1].ToString() && m.PayYear == dr[0].ToInt() && m.PayStatus == 1) > 0)
                                 {
                                     throw (new Exception("当前学生已缴费，请核对缴费数据！"));
                                 }
@@ -2290,7 +2295,7 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
                             }
                             //数据筛查完毕，执行导入
                             //order主表记录查询
-                            var orderlist = BaseRepository("CollegeMIS").FindList<StuEnrollFeeOrderEntity>("select * from StuEnrollFeeOrder where YearNo='" + dr[0].ToString() + "' and StuNo='" + dr[1].ToString() + "' and Status=999");
+                            var orderlist = BaseRepository("CollegeMIS").FindList<StuEnrollFeeOrderEntity>("select * from StuEnrollFeeOrder where YearNo='" +(templateId=="1"? "20"+stufreshlist.FirstOrDefault(m=>m.StuNo== dr[1].ToString()).Grade: dr[0].ToString())  + "' and StuNo='" + dr[1].ToString() + "' and Status=999");
                             //查无订单新建
                             if (orderlist.Count() == 0)
                             {
@@ -2298,7 +2303,7 @@ where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo
                                 db.BeginTrans();
                                 StuEnrollFeeOrderEntity orderEntity = new StuEnrollFeeOrderEntity();
                                 orderEntity.Create();
-                                orderEntity.YearNo = dr[0].ToInt();
+                                orderEntity.YearNo = templateId == "1" ? Convert.ToInt32("20" + stufreshlist.FirstOrDefault(m => m.StuNo == dr[1].ToString()).Grade): dr[0].ToInt();
                                 orderEntity.StuNo = dr[1].ToString();
                                 Random ran = new Random();
                                 orderEntity.orderid = DateTime.Now.ToString("yyyyMMddhhmmss") + ran.Next(0, 100000);