From e409cb81f6718daccf880a448a8d71ddd81359ce Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Fri, 16 Jun 2023 11:51:01 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=202=E3=80=81=E6=95=99=E5=B8=88=E7=AB=AF?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...entTeacherSystemUseLogAnalysisService.java |  7 +--
 ...cherOpenCourseStudentSigninLogService.java | 53 +++++++++++++++----
 web/src/main/resources/sql/jlw/courseInfo.md  |  3 +-
 .../resources/sql/jlw/questionLogSummary.md   |  3 ++
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java
index 52063718..96d32035 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentTeacherSystemUseLogAnalysisService.java
@@ -28,6 +28,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.beetl.sql.annotation.entity.EnumValue;
 import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.query.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -495,9 +496,9 @@ public class StudentTeacherSystemUseLogAnalysisService extends CoreBaseService<S
 
 
         StudentTeacherSystemUseLogAnalysis logAnalysis = sqlManager.lambdaQuery(StudentTeacherSystemUseLogAnalysis.class)
-                .andEq(StudentTeacherSystemUseLogAnalysis::getUniversitiesCollegesId, universitiesCollegesId)
-                .andEq(StudentTeacherSystemUseLogAnalysis::getOrgId, orgId)
-                .andEq(StudentTeacherSystemUseLogAnalysis::getUserId, userId)
+                .andEq(StudentTeacherSystemUseLogAnalysis::getUniversitiesCollegesId, Query.filterEmpty(universitiesCollegesId))
+                .andEq(StudentTeacherSystemUseLogAnalysis::getOrgId, Query.filterEmpty(orgId))
+                .andEq(StudentTeacherSystemUseLogAnalysis::getUserId, Query.filterEmpty(userId))
                 .orderBy("id DESC")
                 .limit(0, 1)
                 .single();
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
index 6963e81f..5073580e 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
@@ -255,6 +255,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         TeacherOpenCourseStudentSigninLog entity = new TeacherOpenCourseStudentSigninLog();
         entity.setStudentId(student.getStudentId());
         entity.setTeacherOpenCourseStudentSigninSettingId(signinSetting.getTeacherOpenCourseStudentSigninSettingId());
+        entity.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN);
         Assert.isTrue(ObjectUtil.isEmpty(teacherOpenCourseStudentSigninLogDao.template(entity)), "该学生已经签到过了！");
 
         // 判断是否加入到这个课程中
@@ -323,15 +324,15 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         Date startTime = signinSetting.getTeacherOpenCourseStudentSigninSettingStartTime();
         Date endTime = signinSetting.getTeacherOpenCourseStudentSigninSettingEndTime();
         if (Objects.isNull(startTime)){
-            Assert.notNull(student, "未开始签到");
+            Assert.notNull(null, "未开始签到");
         }
 
         if (startTime.getTime() > time.getTime()){
-            Assert.notNull(student, "未开始签到");
+            Assert.notNull(null, "未开始签到");
         }
 
         if (!Objects.isNull(endTime) && endTime.getTime() < time.getTime()){
-            Assert.notNull(student, "未开始签到");
+            Assert.notNull(null, "已结束签到");
         }
 
         // 获取到真实的IP
@@ -354,8 +355,23 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         signinLogQuery.setOrgId(student.getOrgId());
         signinLogQuery.setUserId(student.getUserId());
 
-        // 学生签到记录添加
-        add(signinLogQuery);
+        TeacherOpenCourseStudentSigninLog single = teacherOpenCourseStudentSigninLogDao.getSQLManager()
+                .lambdaQuery(TeacherOpenCourseStudentSigninLog.class)
+                .andEq(TeacherOpenCourseStudentSigninLog::getTeacherOpenCourseStudentSigninSettingId, signinSetting.getTeacherOpenCourseStudentSigninSettingId())
+                .andEq(TeacherOpenCourseStudentSigninLog::getTeacherOpenCourseStudentSigninLogTag,UN_SIGN_IN)
+                .andEq(TeacherOpenCourseStudentSigninLog::getStudentId,student.getStudentId())
+                .andEq(TeacherOpenCourseStudentSigninLog::getSchoolClassId,student.getClassId())
+                .single();
+        if (ObjectUtil.isNotNull(single)){
+            single.setTeacherOpenCourseStudentSigninLogRemark(null);
+            single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN);
+            single.setTeacherOpenCourseStudentSigninLogAddTime(new Date());
+            single.setTeacherOpenCourseStudentSigninLogIp(myIpAddress);
+            teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single);
+        }else {
+            // 学生签到记录添加
+            add(signinLogQuery);
+        }
     }
 
     /**
@@ -419,15 +435,15 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         Date startTime = signinSetting.getTeacherOpenCourseStudentSigninSettingStartTime();
         Date endTime = signinSetting.getTeacherOpenCourseStudentSigninSettingEndTime();
         if (Objects.isNull(startTime)){
-            Assert.notNull(student, "未开始签到");
+            Assert.notNull(null, "未开始签到");
         }
 
         if (startTime.getTime() > time.getTime()){
-            Assert.notNull(student, "未开始签到");
+            Assert.notNull(null, "未开始签到");
         }
 
         if (!Objects.isNull(endTime) && endTime.getTime() < time.getTime()){
-            Assert.notNull(student, "未开始签到");
+            Assert.notNull(null, "已结束签到");
         }
 
         // 断言，验证码验证
@@ -447,8 +463,23 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
         signinLogQuery.setOrgId(student.getOrgId());
         signinLogQuery.setUserId(student.getUserId());
 
-        // 学生签到记录添加
-        add(signinLogQuery);
+        TeacherOpenCourseStudentSigninLog single = teacherOpenCourseStudentSigninLogDao.getSQLManager()
+                .lambdaQuery(TeacherOpenCourseStudentSigninLog.class)
+                .andEq(TeacherOpenCourseStudentSigninLog::getTeacherOpenCourseStudentSigninSettingId, signinSetting.getTeacherOpenCourseStudentSigninSettingId())
+                .andEq(TeacherOpenCourseStudentSigninLog::getTeacherOpenCourseStudentSigninLogTag,UN_SIGN_IN)
+                .andEq(TeacherOpenCourseStudentSigninLog::getStudentId,student.getStudentId())
+                .andEq(TeacherOpenCourseStudentSigninLog::getSchoolClassId,student.getClassId())
+                .single();
+        if (ObjectUtil.isNotNull(single)){
+            single.setTeacherOpenCourseStudentSigninLogRemark(null);
+            single.setTeacherOpenCourseStudentSigninLogTag(SIGN_IN);
+            single.setTeacherOpenCourseStudentSigninLogAddTime(new Date());
+            teacherOpenCourseStudentSigninLogDao.upsertByTemplate(single);
+        }else {
+            // 学生签到记录添加
+            add(signinLogQuery);
+        }
+
     }
 
     public JsonResult importTemplate(List<FileEntity> fileEntityList, List<Long>list, CoreUser coreUser){
@@ -754,7 +785,7 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService<Te
                     signInLog.setTeacherOpenCourseStudentSigninLogIp(getIpAddr(Objects.requireNonNull(request)));
                     signInLog.setTeacherOpenCourseStudentSigninLogTag(UN_SIGN_IN);
                     signInLog.setOrgId(single.getOrgId());
-                    signInLog.setUserId(single.getUserId());
+                    signInLog.setUserId(item.getUserId());
                     teacherOpenCourseStudentSigninLogDao.insert(signInLog);
                 }
             });
diff --git a/web/src/main/resources/sql/jlw/courseInfo.md b/web/src/main/resources/sql/jlw/courseInfo.md
index 027333d3..1b184a8b 100644
--- a/web/src/main/resources/sql/jlw/courseInfo.md
+++ b/web/src/main/resources/sql/jlw/courseInfo.md
@@ -906,8 +906,9 @@ getCourseSystemOAndUniversities
   AND ta.course_info_type = 1
   AND ta.course_info_status = 1
   AND a.course_label_status = 1
+  AND a.course_label_type <> '考证课程类'
   @if(!isEmpty(orgId)){
-  AND ta.org_id = #orgId#
+  AND lb.org_id = #orgId#
   AND lb.use_type IN(1,2)
   @}
   )
diff --git a/web/src/main/resources/sql/jlw/questionLogSummary.md b/web/src/main/resources/sql/jlw/questionLogSummary.md
index ab93e2d9..2e1bc422 100644
--- a/web/src/main/resources/sql/jlw/questionLogSummary.md
+++ b/web/src/main/resources/sql/jlw/questionLogSummary.md
@@ -592,6 +592,9 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(personId)){
   and t.person_id =#personId#
   @}
+  @if(!isEmpty(studentId)){
+  and t.person_id =#studentId#
+  @}
   @if(!isEmpty(personIdPlural)){
   and find_in_set(t.person_id,#personIdPlural#)
   @}