Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs

@@ -160,6 +160,7 @@ namespace Learun.Application.WebApi.Modules
                 m.F_RealName,
                 m.F_Account,
                 Year = "20" + stuInfoBasicIbll.GetStuInfoBasicEntityByStuNo(m.F_Account)?.Grade,
+                m.F_IdentityCardNo
             });
             return Success(result);
         }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs

@@ -202,12 +202,15 @@ namespace Learun.Application.WebApi.Modules
                 // 校历
                 var entity = schoolCalendarIbll.GetSchoolCalendarEntityByNo(semesterAndYear.AcademicYearShort, semesterAndYear.Semester);
                 var StartTime = entity.StartTime.Value;
-                startDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(3)).ToString("yyyy-MM-dd");//StartTime.AddDays(((curWeek - 1) * 14)).ToString("yyyy-MM-dd");
-                if (Convert.ToDateTime(startDate) < StartTime)
+                //获取第几周
+                var curWeek = WeekOfYear(startdate, entity.StartTime.Value, entity.EndTime.Value);
+                ///获取当前周次开始时间
+                startDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).ToString("yyyy-MM-dd");
+                if (curWeek == 1 && Convert.ToDateTime(startDate) < StartTime)//判断第几周
                 {
                     startDate = StartTime.ToString("yyyy-MM-dd");
                 }
-                endDate = Common.CalculateFirstDateOfWeek(StartTime).AddDays(12).ToString("yyyy-MM-dd");
+                endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(9).ToString("yyyy-MM-dd");
                 param.StartDate = startDate;
                 param.EndDate = endDate;
             }
@@ -311,6 +314,37 @@ namespace Learun.Application.WebApi.Modules
             }
             return res;
         }
+        /// <summary>
+        /// 换算周次
+        /// </summary>
+        /// <param name="curDay"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns></returns>
+        private static int WeekOfYear(DateTime curDay, DateTime startTime, DateTime endTime)
+        {
+            int firstdayofweek = Convert.ToInt32(startTime.DayOfWeek);
+            var startDate = DateTime.Parse(Common.CalculateFirstDateOfWeek(startTime).ToString("yyyy-MM-dd"));
+            int k = Convert.ToInt32(startTime.DayOfWeek);//得到开始时间的第一天是周几
+            int days = curDay.Subtract(startTime).Days;
+            //int days = curDay.DayOfYear;
+            int daysOutOneWeek = days - (14 - firstdayofweek);
+
+            if (daysOutOneWeek <= 0)
+            {
+                return 1;
+            }
+            else
+            {
+                int weeks = daysOutOneWeek / 14;
+                if (daysOutOneWeek % 14 != 0)
+                    weeks++;
+
+                return weeks + 1;
+
+            }
+
+        }
     }
 
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue

@@ -33,7 +33,7 @@
       </view>
     </template>
 
-    <l-textarea v-model="remark" :placeholder="`输入${typeText}备注`" title="备注：" />
+    <l-textarea v-model="remark" :placeholder="`输入${typeText}审核意见`" title="审核意见：" />
 
     <view class="padding margin-top bg-white">
       <l-button @click="submit" class="block" size="lg" color="green" block>提交流程{{ typeText }}</l-button>