guzijian / bsth-alcohol-sign · Commits

Commit 9da983284f6455c25a213c9b7167c4313081465c

Authored by guzijian
1 parent 5cb18223

fix: 新增显示字段

Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
  View file @9da9832
@@ -324,18 +324,18 @@ public class DriverServiceImpl implements IDriverService { @@ -324,18 +324,18 @@ public class DriverServiceImpl implements IDriverService {
324 if (BC_TYPE_OUT.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) { 324 if (BC_TYPE_OUT.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) {
325 // 售票员无需酒精测试 325 // 售票员无需酒精测试
326 if (item.getPosts().equals(PERSONNEL_POSTS_DRIVER)) 326 if (item.getPosts().equals(PERSONNEL_POSTS_DRIVER))
327 - vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName()); 327 + vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName(),item.getLineName());
328 else 328 else
329 - vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, !alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName()); 329 + vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, !alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName(),item.getLineName());
330 } else if (BC_TYPE_IN.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) { 330 } else if (BC_TYPE_IN.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) {
331 - vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_OUT_STRING, !alcoholFlag, !schedulingFlag,item.getNbbm(),item.getLpName()); 331 + vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_OUT_STRING, !alcoholFlag, !schedulingFlag,item.getNbbm(),item.getLpName(),item.getLineName());
332 } 332 }
333 } 333 }
334 // 更新信息 334 // 更新信息
335 for (Driver item : drivers) { 335 for (Driver item : drivers) {
336 // 无排班 336 // 无排班
337 if (Objects.isNull(vo)) { 337 if (Objects.isNull(vo)) {
338 - vos.add(new DriverResponseVo(null, item, null, null, false,null,null)); 338 + vos.add(new DriverResponseVo(null, item, null, null, false,null,null,null));
339 } else { 339 } else {
340 vos.add(vo); 340 vos.add(vo);
341 } 341 }
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/DriverResponseVo.java
  View file @9da9832
@@ -27,7 +27,8 @@ public class DriverResponseVo extends Driver { @@ -27,7 +27,8 @@ public class DriverResponseVo extends Driver {
27 @ApiModelProperty("路牌") 27 @ApiModelProperty("路牌")
28 private String lpName; 28 private String lpName;
29 29
30 - public DriverResponseVo(Long signTime, Driver driver,String planAction,Boolean checkAlcohol,Boolean schedulingFlag,String nbbm,String lpName){ 30 + public DriverResponseVo(Long signTime, Driver driver,String planAction,Boolean checkAlcohol,Boolean schedulingFlag,String nbbm,String lpName,String lineName){
  31 + this.setLineName(lineName);
31 this.setNbbm(nbbm); 32 this.setNbbm(nbbm);
32 this.setLpName(lpName); 33 this.setLpName(lpName);
33 this.setSignTime(signTime); 34 this.setSignTime(signTime);