yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-06-27 08:41:20 +08:00
parent da6a7c744c
commit c0820becbc
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/entity/KcJieci.java
View File

@ -52,5 +52,7 @@ public class KcJieci implements Serializable {
@TableField(exist = false)
private String type;
@TableField(exist = false)
private String sjsksj;
}

11
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java
View File

@ -2,6 +2,7 @@ package org.jeecg.modules.kc.kcJieci.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.kc.kcJieci.entity.KcJieci;
import org.jeecg.modules.kc.kcJieci.mapper.KcJieciMapper;
@ -33,6 +34,7 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
List<KcJieci> list = baseMapper.selectList(queryWrapper);
List<KcJieci> resList = new ArrayList<>();
String dqsj = DateUtils.getDate("HHmm");//获取当前时间的小时和分钟
String sjkssj = "";//实际开始时间 用于判断正在上课和即将上课的文字切换
String minDate = list.get(0).getHhks();//最小开始时间
String maxDate = list.get(5).getHhjs();//最大结束时间
String dqkssj = DateUtils.getDate("yyyy-MM-dd");//当前开始时间
@ -46,11 +48,8 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
minDate = DateUtil.format(calendarMin.getTime(),"HHmm") ;
if(Integer.parseInt(dqsj)<Integer.parseInt(minDate)){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
calendar.add(Calendar.DAY_OF_MONTH, -1); //当前时间减去一天，即一天前的时间
//如果当前时间小于第一节开始时间则当前时间赋值为昨天，节次为最后一节
dqkssj = simpleDateFormat.format(calendar.getTime());
dqkssj = DateUtils.getDate("yyyy-MM-dd");
dqjc = "";
//下一节赋值为当天第一节
xyjkssj = DateUtils.getDate("yyyy-MM-dd");
@ -79,6 +78,7 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
//从当前日期减去15分钟
calendar2.add(Calendar.MINUTE, -30);
kssj = DateUtil.format(calendar2.getTime(),"HHmm") ;
sjkssj = list.get(i).getHhks();
//
// if(i==list.size()-1){
// kssj = list.get(i).getHhks();
@ -119,6 +119,9 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
kcJieciRes.setKssj(dqkssj);
kcJieciRes.setJieci(dqjc);
kcJieciRes.setType("1");
if(StringUtils.isNotBlank(sjkssj)){
kcJieciRes.setSjsksj(dqkssj+" "+sjkssj.substring(0,2)+":"+sjkssj.substring(2,4)+":00");
}
resList.add(kcJieciRes);
kcJieciRes = new KcJieci();
kcJieciRes.setKssj(xyjkssj);