2023年4月6日 完善听课足迹
This commit is contained in:
parent
cef596fd58
commit
98c76b702c
|
@ -235,4 +235,14 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 按UserId和时间查询听课
|
||||||
|
* @param kcTingke
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/findTingKeZuJiBytingketimeAndUserId")
|
||||||
|
public Result<?> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke){
|
||||||
|
return Result.OK(service.findTingKeZuJiBytingketimeAndUserId(kcTingke));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import org.jeecg.modules.kc.tktj.entity.KcTingke;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: kc_tingke
|
* @Description: kc_tingke
|
||||||
|
@ -25,4 +26,6 @@ public interface KcTingkeMapper extends BaseMapper<KcTingke> {
|
||||||
List<KcTingke> getTkztjList(KcTingke kcTingke);
|
List<KcTingke> getTkztjList(KcTingke kcTingke);
|
||||||
|
|
||||||
List<KcTingke> getTkfglList(KcTingke kcTingke);
|
List<KcTingke> getTkfglList(KcTingke kcTingke);
|
||||||
|
|
||||||
|
List<Map<String,Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke);
|
||||||
}
|
}
|
||||||
|
|
|
@ -337,4 +337,53 @@
|
||||||
</if>
|
</if>
|
||||||
) t2
|
) t2
|
||||||
</select>
|
</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>
|
</mapper>
|
|
@ -7,6 +7,7 @@ import org.jeecg.modules.kc.tktj.entity.KcTingke;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: kc_tingke
|
* @Description: kc_tingke
|
||||||
|
@ -23,4 +24,6 @@ public interface IKcTingkeService extends IService<KcTingke> {
|
||||||
List<KcTingke> getTkztjList(KcTingke kcTingke);
|
List<KcTingke> getTkztjList(KcTingke kcTingke);
|
||||||
|
|
||||||
List<KcTingke> getTkfglList(KcTingke kcTingke);
|
List<KcTingke> getTkfglList(KcTingke kcTingke);
|
||||||
|
|
||||||
|
List<Map<String,Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: kc_tingke
|
* @Description: kc_tingke
|
||||||
|
@ -40,4 +41,9 @@ public class KcTingkeServiceImpl extends ServiceImpl<KcTingkeMapper, KcTingke> i
|
||||||
public List<KcTingke> getTkfglList(KcTingke kcTingke) {
|
public List<KcTingke> getTkfglList(KcTingke kcTingke) {
|
||||||
return baseMapper.getTkfglList(kcTingke);
|
return baseMapper.getTkfglList(kcTingke);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<Map<String, Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke) {
|
||||||
|
return baseMapper.findTingKeZuJiBytingketimeAndUserId(kcTingke);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue