Skip to content

H
haoban-manage3.0
Commit 19f7f317 by 徐高华
Options

预约

parent 5d77cbe0
Showing with 17 additions and 10 deletions
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/offline/OfflinePreController.java
...@@ -56,16 +56,23 @@ public class OfflinePreController { ...@@ -56,16 +56,23 @@ public class OfflinePreController {
List<OfflinePreInfoVO> voList = new ArrayList<>() ; List<OfflinePreInfoVO> voList = new ArrayList<>() ;
for(OfflinePreInfoDTO dto : list) { for(OfflinePreInfoDTO dto : list) {
OfflinePreInfoVO vo = EntityUtil.changeEntityByJSON(OfflinePreInfoVO.class,dto) ; OfflinePreInfoVO vo = EntityUtil.changeEntityByJSON(OfflinePreInfoVO.class,dto) ;
if(null != qo.getType() && qo.getType()==1) { if(null != qo.getType()) {
if ((dto.getPreTime().getTime() < System.currentTimeMillis() || this.getAheadSignFlag(dto.getAheadSignFlag()) == 1) if(qo.getType()==1) {
&& DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() >= DateUtil.getStartTimeOfDay().getTime()) { if ((dto.getPreTime().getTime() < System.currentTimeMillis() || this.getAheadSignFlag(dto.getAheadSignFlag()) == 1)
vo.setCanSign(1); && DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() >= DateUtil.getStartTimeOfDay().getTime()) {
} else { vo.setCanSign(1);
if (DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() < DateUtil.getStartTimeOfDay().getTime()) { } else {
logger.info("已过期"); if (DateUtil.getStartTimeOfDay(dto.getPreTime()).getTime() < DateUtil.getStartTimeOfDay().getTime()) {
continue; logger.info("已过期");
} else if (this.getAheadSignFlag(dto.getAheadSignFlag()) == 0 && dto.getPreTime().getTime() > System.currentTimeMillis()) { continue;
vo.setReason("不可提前签到"); } else if (this.getAheadSignFlag(dto.getAheadSignFlag()) == 0 && dto.getPreTime().getTime() > System.currentTimeMillis()) {
vo.setReason("不可提前签到");
}
}
}
if(qo.getType()==2) {
if(dto.getStatusFlag() ==0) {
vo.setStatusFlag(2);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment