添加功能
This commit is contained in:
parent
b88b468bb4
commit
f6b3748e38
|
|
@ -49,7 +49,7 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
|
|||
xyjkssj = DateUtils.getDate("yyyy-MM-dd");
|
||||
xyjjc = list.get(0).getJieci();
|
||||
}else{
|
||||
if(Integer.parseInt(dqsj)>Integer.parseInt(maxDate)){
|
||||
if(Integer.parseInt(dqsj)<Integer.parseInt(maxDate)){
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
|
||||
Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
|
||||
calendar.add(Calendar.DAY_OF_MONTH, +1); //当前时间减去一天，即一天前的时间
|
||||
|
|
@ -65,7 +65,7 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
|
|||
String jssj = "";
|
||||
if(i==list.size()-1){
|
||||
kssj = list.get(i).getHhks();
|
||||
jssj = "23:59";
|
||||
jssj = list.get(i).getHhjs();
|
||||
}else{
|
||||
kssj = list.get(i).getHhks();
|
||||
jssj = list.get(i+1).getHhks();
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@
|
|||
t2.skrq,
|
||||
t2.kssl,
|
||||
ifnull( t1.tkkts, 0 ) tkkts,
|
||||
ifnull( t1.tkrcs, 0 ) tkrcs,
|
||||
ifnull( t1.tkrcs, 0 ) tkrcs
|
||||
FROM
|
||||
(
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletResponse;
|
|||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.modules.kc.pktj.entity.KcEvaluation;
|
||||
import org.jeecg.modules.kc.pktj.service.IKcEvaluationService;
|
||||
import org.jeecg.modules.kc.tktj.entity.KcTingke;
|
||||
import org.jeecg.modules.kc.tktj.service.IKcTingkeService;
|
||||
|
||||
|
|
@ -38,6 +40,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||
public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeService> {
|
||||
@Autowired
|
||||
private IKcTingkeService kcTingkeService;
|
||||
@Autowired
|
||||
private IKcEvaluationService kcEvaluationService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
|
|
@ -245,4 +249,59 @@ public class KcTingkeController extends JeecgController<KcTingke, IKcTingkeServi
|
|||
return Result.OK(service.findTingKeZuJiBytingketimeAndUserId(kcTingke));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(value = "/getIndexTpkztjList")
|
||||
public Result<List<KcTingke>> getIndexTpkztjList(KcTingke kcTingke) {
|
||||
List<KcTingke> pageList = kcTingkeService.getTkztjList(kcTingke);//听课周统计
|
||||
KcEvaluation kcEvaluation = new KcEvaluation();
|
||||
kcEvaluation.setStartTime(kcTingke.getStartTime());
|
||||
kcEvaluation.setEndTime(kcTingke.getEndTime());
|
||||
kcEvaluation.setKkdw(kcTingke.getKkdw());
|
||||
kcEvaluation.setKcxz(kcTingke.getKcxz());
|
||||
List<KcEvaluation> list = kcEvaluationService.getPkztjTjt(kcEvaluation);
|
||||
for(int i=0;i<pageList.size();i++){
|
||||
if(list.size()==0 || list.get(i)==null){
|
||||
pageList.get(i).setPkrc("0");
|
||||
}else{
|
||||
pageList.get(i).setPkrc(list.get(i).getTkrcs());
|
||||
}
|
||||
}
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(value = "/getIndexTpkfglList")
|
||||
public Result<List<KcTingke>> getIndexTpkfglList(KcTingke kcTingke) {
|
||||
List<KcTingke> pageList = kcTingkeService.getTkfglList(kcTingke);
|
||||
|
||||
KcEvaluation kcEvaluation = new KcEvaluation();
|
||||
kcEvaluation.setStartTime(kcTingke.getStartTime());
|
||||
kcEvaluation.setEndTime(kcTingke.getEndTime());
|
||||
kcEvaluation.setKcxz(kcTingke.getKcxz());
|
||||
List<KcEvaluation> list = kcEvaluationService.getPkfglTjt(kcEvaluation);
|
||||
for(int i=0;i<pageList.size();i++){
|
||||
if(list.size()==0 || list.get(i)==null){
|
||||
pageList.get(i).setPkrc("0");
|
||||
pageList.get(i).setLjqxpkrl("0");
|
||||
}else{
|
||||
pageList.get(i).setPkrc(list.get(i).getLjtkv());
|
||||
pageList.get(i).setLjqxpkrl(list.get(i).getAvgtkv());
|
||||
}
|
||||
|
||||
}
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping(value = "/getHtindexTkmxlist")
|
||||
public Result<List<KcTingke>> getHtindexTkmxlist(KcTingke kcTingke) {
|
||||
|
||||
List<KcTingke> pageList = kcTingkeService.getHtindexTkmxlist(kcTingke);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,5 +168,17 @@ public class KcTingke implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private java.lang.String jsxm;
|
||||
|
||||
@TableField(exist = false)
|
||||
private java.lang.String pkrc;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String ljqxpkrl;
|
||||
|
||||
@TableField(exist = false)
|
||||
private java.lang.Integer pageKs;
|
||||
@TableField(exist = false)
|
||||
private java.lang.Integer pageJs;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String type;
|
||||
|
||||
// private java.lang.String tingketime;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,4 +28,6 @@ public interface KcTingkeMapper extends BaseMapper<KcTingke> {
|
|||
List<KcTingke> getTkfglList(KcTingke kcTingke);
|
||||
|
||||
List<Map<String,Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke);
|
||||
|
||||
List<KcTingke> getHtindexTkmxlist(KcTingke kcTingke);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -386,4 +386,22 @@
|
|||
</if>
|
||||
) ev ON tk.ketangbiaoid = ev.ketangbiaoid
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getHtindexTkmxlist" resultType="org.jeecg.modules.kc.tktj.entity.KcTingke">
|
||||
select * from (
|
||||
SELECT k.kkdw,k.skjs,k.kcmc, t.username,'1' type ,tingketime
|
||||
FROM (select * from kc_ketangbiao where skrq > #{skrq}) k, kc_tingke t
|
||||
WHERE k.id = t.kechengbiaoid
|
||||
) a
|
||||
union all
|
||||
SELECT * from (
|
||||
select k.kkdw,k.skjs,k.kcmc,e.subper as username ,'2' type , e.create_time as tingketime
|
||||
from (select * from kc_ketangbiao where skrq > #{skrq}) k,kc_errorreport e
|
||||
where e.kechengbiaoid = k.id
|
||||
) b
|
||||
ORDER BY tingketime DESC
|
||||
limit ${pageKs} , ${pageJs}
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
@ -26,4 +26,6 @@ public interface IKcTingkeService extends IService<KcTingke> {
|
|||
List<KcTingke> getTkfglList(KcTingke kcTingke);
|
||||
|
||||
List<Map<String,Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke);
|
||||
|
||||
List<KcTingke> getHtindexTkmxlist(KcTingke kcTingke);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,4 +46,9 @@ public class KcTingkeServiceImpl extends ServiceImpl<KcTingkeMapper, KcTingke> i
|
|||
public List<Map<String, Object>> findTingKeZuJiBytingketimeAndUserId(KcTingke kcTingke) {
|
||||
return baseMapper.findTingKeZuJiBytingketimeAndUserId(kcTingke);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<KcTingke> getHtindexTkmxlist(KcTingke kcTingke) {
|
||||
return baseMapper.getHtindexTkmxlist(kcTingke);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue