Commit e12f6a7cbfb7b48d6e17cc921178fc870bef5726
1 parent
e57171a9
数据字典添加分别字符key
Showing
1 changed file
with
6 additions
and
1 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
| @@ -582,7 +582,12 @@ public class DssDriverController extends BaseController { | @@ -582,7 +582,12 @@ public class DssDriverController extends BaseController { | ||
| 582 | private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) { | 582 | private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) { |
| 583 | GetWineRecordVo vo = new GetWineRecordVo(); | 583 | GetWineRecordVo vo = new GetWineRecordVo(); |
| 584 | vo.setCheckTime(signIn.getCreateTime()); | 584 | vo.setCheckTime(signIn.getCreateTime()); |
| 585 | - vo.setCheck(Objects.equals(signIn.getType(), 0)); | 585 | + if (DateUtils.isSameDay(signIn.getCreateTime(), new Date())) { |
| 586 | + vo.setCheck(Objects.equals(signIn.getType(), 0)); | ||
| 587 | + } else { | ||
| 588 | + vo.setCheck(Boolean.TRUE); | ||
| 589 | + } | ||
| 590 | + | ||
| 586 | 591 | ||
| 587 | return vo; | 592 | return vo; |
| 588 | } | 593 | } |