From 98c76b702c96a504e03a5c16035abf508393da8b Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 6 Apr 2023 21:33:27 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B44=E6=9C=886=E6=97=A5=20=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=90=AC=E8=AF=BE=E8=B6=B3=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tktj/controller/KcTingkeController.java   | 10 ++++
 .../kc/tktj/mapper/KcTingkeMapper.java        |  3 ++
 .../kc/tktj/mapper/xml/KcTingkeMapper.xml     | 49 +++++++++++++++++++
 .../kc/tktj/service/IKcTingkeService.java     |  3 ++
 .../service/impl/KcTingkeServiceImpl.java     |  6 +++
 5 files changed, 71 insertions(+)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
index 039c711d..cd7b0e7e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/controller/KcTingkeController.java
@@ -235,4 +235,14 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
 		 return Result.OK(pageList);
 	 }
 
+	 /**
+	  * 按UserId和时间查询听课
+	  * @param kcTingke
+	  * @return
+	  */
+	 @GetMapping(value = "/findTingKeZuJiBytingketimeAndUserId")
+	 public Result<?> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke){
+		 return Result.OK(service.findTingKeZuJiBytingketimeAndUserId(kcTingke));
+	 }
+
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java
index 89ed1261..9662e367 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/KcTingkeMapper.java
@@ -9,6 +9,7 @@ import org.jeecg.modules.kc.tktj.entity.KcTingke;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: kc_tingke
@@ -25,4 +26,6 @@ public interface KcTingkeMapper extends BaseMapper<KcTingke> {
     List<KcTingke> getTkztjList(KcTingke kcTingke);
 
     List<KcTingke> getTkfglList(KcTingke kcTingke);
+
+    List<Map<String,Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke);
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
index cb787567..a05a3f88 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
@@ -337,4 +337,53 @@
         </if>
         ) t2
     </select>
+
+    <select id="findTingKeZuJiBytingketimeAndUserId" resultType="java.util.Map">
+        SELECT
+            tingketime, tkrq, shijian, hq, mq,
+            tk.kcmc, tk.ketangbiaoid, tk.skjs, tk.kkdw, tk.userid, tk.hh, tk.WEEK,
+            ev.evaluationid, ev.evaluationver, ev.score
+        FROM
+            (
+            SELECT
+                tingketime,
+                IF (CURDATE()= DATE_FORMAT( tk.tingketime, '%Y/%m/%d' ),'',DATE_FORMAT( tk.tingketime, '%Y-%m-%d' )) AS tkrq,
+                DATE_FORMAT( tk.tingketime, '%H:%i:%s' ) AS shijian,
+                TIMESTAMPDIFF( HOUR, tk.tingketime, NOW() ) AS hq,
+                TIMESTAMPDIFF( MINUTE, tk.tingketime, NOW() ) AS mq,
+                kt.kcmc, kt.id AS ketangbiaoid, kt.skjs, kt.kkdw, tk.userid, kt.hh, kt.WEEK
+            FROM
+                kc_tingke tk,
+                kc_ketangbiao kt
+            WHERE
+                tk.kechengbiaoid = kt.id
+                <if test="tingketime != null and tingketime != ''">
+                    AND tk.tingketime > #{tingketime,jdbcType=VARCHAR}
+                </if>
+                <if test="tingketime != null and tingketime != ''">
+                    AND tk.userid = #{userid}
+                </if>
+                ORDER BY tk.tingketime DESC
+            LIMIT 3
+            ) tk
+        LEFT JOIN (
+            SELECT
+               ev.id AS evaluationid, ev.evaluationver, evs.ketangbiaoid, ea.score
+            FROM
+                kc_evaluation ev,
+                kc_evaluations evs,
+                kc_evaluationque eq,
+                kc_evaluationans ea
+            WHERE
+                ev.id = evs.evaluationid
+                AND ev.evaluationver = eq.evaluationver
+                AND ea.id = evs.ansid
+                AND evs.queid = eq.id
+                AND ea.queid = eq.id
+                AND eq.genre = 0
+                <if test="tingketime != null and tingketime != ''">
+                    AND evs.upuserid = #{userid}
+                </if>
+            ) ev ON tk.ketangbiaoid = ev.ketangbiaoid
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java
index efab53c5..9f01ac7a 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/IKcTingkeService.java
@@ -7,6 +7,7 @@ import org.jeecg.modules.kc.tktj.entity.KcTingke;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: kc_tingke
@@ -23,4 +24,6 @@ public interface IKcTingkeService extends IService<KcTingke> {
     List<KcTingke> getTkztjList(KcTingke kcTingke);
 
     List<KcTingke> getTkfglList(KcTingke kcTingke);
+
+    List<Map<String,Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke);
 }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java
index d244c243..a0e0e4c9 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/service/impl/KcTingkeServiceImpl.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: kc_tingke
@@ -40,4 +41,9 @@ public class KcTingkeServiceImpl extends ServiceImpl<KcTingkeMapper, KcTingke> i
     public List<KcTingke> getTkfglList(KcTingke kcTingke) {
         return baseMapper.getTkfglList(kcTingke);
     }
+
+    @Override
+    public List<Map<String, Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke) {
+        return baseMapper.findTingKeZuJiBytingketimeAndUserId(kcTingke);
+    }
 }