wms / wms_xiaogangabu · Commits

Commit c592332b4c19a86f8aacc4d67f32eb1147a00e67

Authored by DESKTOP-AO0VKC8\mahua
1 parent b6752bf2
develop ... test

新增可预约人数

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
src/main/java/com/huaheng/pc/receipt/reservation/service/impl/ReservationServiceImpl.java
  View file @c592332
... ... @@ -36,6 +36,7 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
36 36 String beginTime = configService.selectConfigByKey("reservation.begin.time");
37 37 //预约间隔时间
38 38 int interval = Integer.parseInt(configService.selectConfigByKey("reservation.interval.time"));
  39 + int reservationsNumber = Integer.parseInt(configService.selectConfigByKey("number.reservations"));
39 40 if (StringUtils.isEmpty(endTime)) {
40 41 throw new ServiceException("预约结束时间未配置");
41 42 }
... ... @@ -75,6 +76,7 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
75 76 .eq(Reservation::getWarehouseCode, warehouseCode);
76 77 map.put("endTime", resBeginTime.format(fmt24));
77 78 map.put("number", this.count(queryWrapper));
  79 + map.put("reservationsNumber", reservationsNumber);
78 80 result.add(map);
79 81 }
80 82 } else {
... ... @@ -98,6 +100,7 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
98 100 }
99 101 queryWrapper.eq(Reservation::getWarehouseCode, warehouseCode);
100 102 map.put("number", this.count(queryWrapper));
  103 + map.put("reservationsNumber", reservationsNumber);
101 104 result.add(map);
102 105 }
103 106 }
... ...
src/main/resources/templates/receipt/reservation/view.html
  View file @c592332
... ... @@ -56,7 +56,7 @@
56 56 html += "\">\n"
57 57 }
58 58 html += "<p>"+result.data[i].beginTime+"-"+result.data[i].endTime+"</p>\n" +
59   - "<a onclick=add(\""+result.data[i].beginTime+"\",\""+result.data[i].endTime+"\")>预约到达时间</a><div><span>当前已预约人数：</span><div class=\"stat-percent\">"+result.data[i].number+"</div>\n" +
  59 + "<a onclick=add(\""+result.data[i].beginTime+"\",\""+result.data[i].endTime+"\")>预约到达时间</a><div><span>当前已预约人数：</span><div class=\"stat-percent\">"+result.data[i].number+"/"+result.data[i].reservationsNumber+"</div>\n" +
60 60 "</div></div></div></div>";
61 61 $("#tab1-"+index).append(html);
62 62 }
... ...