Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Controllers/Ask_MainController.cs

@@ -102,7 +102,7 @@ namespace Learun.Application.Web.Areas.Ask.Controllers
         public ActionResult Form()
         {
             ViewBag.VSerial = "Table_" + CommonHelper.CreateNo();
-            var xnxq = Common.GetSemesterAndYear();
+            var xnxq = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
             ViewBag.AcademicYearNo = xnxq.AcademicYearShort;
             ViewBag.Semester = xnxq.Semester;
             return View();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeExamTermController.cs

@@ -178,10 +178,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             //开始时间
             var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
-            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
-            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var startDate = TwoDevelopment.EducationalAdministration.Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = TwoDevelopment.EducationalAdministration.Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
 
-            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear(startDate);
             var strAcademicYear = semesterAndYear.AcademicYearLong;
             var strSemester = semesterAndYear.Semester;
             //默认节次时间
@@ -268,10 +268,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             //开始时间
             var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
-            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
-            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var startDate = TwoDevelopment.EducationalAdministration.Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = TwoDevelopment.EducationalAdministration.Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
 
-            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear(startDate);
             var strAcademicYear = semesterAndYear.AcademicYearLong;
             var strSemester = semesterAndYear.Semester;
             //默认节次时间
@@ -383,7 +383,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             var data = new List<string>();
 
-            var monday = Common.CalculateFirstDateOfWeek(Convert.ToDateTime(startTime));
+            var monday = TwoDevelopment.EducationalAdministration.Common.CalculateFirstDateOfWeek(Convert.ToDateTime(startTime));
             for (int i = 0; i < 7; i++)
             {
                 data.Add(monday.AddDays(i).ToDateString());

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs

@@ -290,7 +290,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult StatisticIndex()
         {
-            var academic = Common.GetSemesterAndYear();
+            var academic = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
             ViewBag.Grade = academic.AcademicYearShort.Substring(0, 2);
             return View();
         }
@@ -301,7 +301,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult StatisticClassIndex()
         {
-            var academic = Common.GetSemesterAndYear();
+            var academic = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
             ViewBag.Grade = academic.AcademicYearShort.Substring(0, 2);
             return View();
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs

@@ -57,7 +57,7 @@ namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers
             var logininfo = LoginUserInfo.Get();
             ViewBag.StuNo = logininfo.account;
             ViewBag.StuName = logininfo.realName;
-            var yearsemester = Common.GetSemesterAndYear();
+            var yearsemester = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
 
             ViewBag.AcademicYearNo = yearsemester.AcademicYearShort;
             ViewBag.Semester = yearsemester.Semester;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTChartController.cs

@@ -129,7 +129,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
                 if (dtListEntity != null)
                 {
                     //获取当前时间学年和学期
-                    var yearAndSemester = Common.GetSemesterAndYear();
+                    var yearAndSemester = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
                     var sql = dtListEntity.F_Sql;
                     var strSql = $" where t.AcademicYearNo='{yearAndSemester.AcademicYearShort}' and t.Semester='{yearAndSemester.Semester}' ";
                     var tempsql = sql.Substring(0, sql.IndexOf("group")) + strSql + sql.Substring(sql.IndexOf("group"));

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs

@@ -202,10 +202,10 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             //var endDate = endTime ?? Common.CalculateLastDateOfWeek(DateTime.Today).ToString("yyyy-MM-dd");
             //开始时间
             var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
-            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
-            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var startDate = TwoDevelopment.EducationalAdministration.Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = TwoDevelopment.EducationalAdministration.Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
 
-            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear(startDate);
             var strAcademicYear = semesterAndYear.AcademicYearLong;
             var strSemester = semesterAndYear.Semester;
 
@@ -311,10 +311,10 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             var userInfo = LoginUserInfo.Get();
             //开始时间
             var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
-            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
-            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var startDate = TwoDevelopment.EducationalAdministration.Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = TwoDevelopment.EducationalAdministration.Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
 
-            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear(startDate);
             var strAcademicYear = semesterAndYear.AcademicYearLong;
             var strSemester = semesterAndYear.Semester;
 
@@ -380,10 +380,10 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             var userInfo = LoginUserInfo.Get();
             //开始时间
             var startdate = string.IsNullOrEmpty(startTime) ? DateTime.Today : Convert.ToDateTime(startTime);
-            var startDate = Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
-            var endDate = Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var startDate = TwoDevelopment.EducationalAdministration.Common.CalculateFirstDateOfWeek(startdate).ToString("yyyy-MM-dd");
+            var endDate = TwoDevelopment.EducationalAdministration.Common.CalculateLastDateOfWeek(startdate).ToString("yyyy-MM-dd");
 
-            var semesterAndYear = Common.GetSemesterAndYear(startDate);
+            var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear(startDate);
             var strAcademicYear = semesterAndYear.AcademicYearLong;
             var strSemester = semesterAndYear.Semester;
 

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

@@ -68,7 +68,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [HttpGet]
         public ActionResult ShowIndex()
         {
-            var semesterAndYear = Common.GetSemesterAndYear();
+            var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
             var queryObject = new { AcademicYearNo = semesterAndYear.AcademicYearShort, Semester = semesterAndYear.Semester, Grade = semesterAndYear.AcademicYearShort.Substring(0, 2) };
             var queryJson = JsonConvert.SerializeObject(queryObject);
             var data = finaChargesStandardIBLL.GetTreeList(queryJson).Where(x => x.ParentId == "0");
@@ -365,7 +365,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [HttpGet]
         public ActionResult AcademicAndSemeter()
         {
-            var semesterAndYear = Common.GetSemesterAndYear();
+            var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
             return Success(new { academic = semesterAndYear.AcademicYearShort, semester = semesterAndYear.Semester, grade = semesterAndYear.AcademicYearShort.Substring(0, 2) });
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs

@@ -760,7 +760,7 @@ namespace Learun.Application.Web.Controllers
         [HttpGet]
         public ActionResult GetYearAndSemesteResult()
         {
-            var result = Common.GetSemesterAndYear();
+            var result = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
             return Success(result);
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/OnlineRegistrateController.cs

@@ -144,7 +144,7 @@ namespace Learun.Application.Web.Controllers
                 onlineUserInfo.MajorName = cdMajorIBLL.GetCdMajorEntityByMajorNo(onlineUserInfo.MajorId)?.MajorName;
 
                 //费用信息
-                var semesterAndYear = Common.GetSemesterAndYear();
+                var semesterAndYear = TwoDevelopment.EducationalAdministration.Common.GetSemesterAndYear();
                 var finaChargesStandardEntities = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNoOfNotAll(osinfo?.MajorId, semesterAndYear.AcademicYearShort, semesterAndYear.Semester, semesterAndYear.AcademicYearShort.Substring(0, 2));
                 if (finaChargesStandardEntities.Any())
                 {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Learun.Util.csproj

@@ -31,6 +31,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>