guzijian / bsth-alcohol-sign · Commits

Commit a93def1fd9abfb664aec4e928fe11b5f2d31c3e0

Authored by liujun001
1 parent 8105bd44
build: skipped

优化导入数据

Inline Side-by-side
Showing 2 changed files with 11 additions and 7 deletions
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/exception/vo/SignExceptionVo.java
  View file @a93def1
@@ -26,17 +26,17 @@ public class SignExceptionVo implements java.io.Serializable { @@ -26,17 +26,17 @@ public class SignExceptionVo implements java.io.Serializable {
26 private java.lang.String fleetName; 26 private java.lang.String fleetName;
27 27
28 /***线路名称*/ 28 /***线路名称*/
29 - @ApiModelProperty(name = "线路名称") 29 + @ApiModelProperty(value = "线路名称")
30 private java.lang.String lineName; 30 private java.lang.String lineName;
31 - @ApiModelProperty(name = "打卡时间") 31 + @ApiModelProperty(value = "打卡时间")
32 private java.util.Date signTime; 32 private java.util.Date signTime;
33 - @ApiModelProperty(name = "车辆自编号") 33 + @ApiModelProperty(value = "车辆自编号")
34 private java.lang.String nbbm; 34 private java.lang.String nbbm;
35 - @ApiModelProperty(name = "员工工号") 35 + @ApiModelProperty(value = "员工工号")
36 private String jobCode; 36 private String jobCode;
37 - @ApiModelProperty(name = "员工姓名") 37 + @ApiModelProperty(value = "员工姓名")
38 private java.lang.String personnelName; 38 private java.lang.String personnelName;
39 - @ApiModelProperty(name = "酒测状态 签到结果0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒") 39 + @ApiModelProperty( "酒测状态 签到结果0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒")
40 private int signStatus; 40 private int signStatus;
41 @ApiModelProperty("酒精摄入量 52.12") 41 @ApiModelProperty("酒精摄入量 52.12")
42 private BigDecimal alcoholIntake; 42 private BigDecimal alcoholIntake;
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/exception/report/EquipmentExceptionReportServiceImpl.java
  View file @a93def1
@@ -80,7 +80,11 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl<EquipmentEx @@ -80,7 +80,11 @@ public class EquipmentExceptionReportServiceImpl extends ServiceImpl<EquipmentEx
80 80
81 @Override 81 @Override
82 public List<EquipmentExceptionReport> list(EquipmentExceptionReport entity) { 82 public List<EquipmentExceptionReport> list(EquipmentExceptionReport entity) {
83 - return list(new LambdaQueryWrapper<>(entity)); 83 + LambdaQueryWrapper<EquipmentExceptionReport> wrapper = new LambdaQueryWrapper<>(entity);
  84 + if(CollectionUtils.isNotEmpty(entity.getSignIds())){
  85 + wrapper.in(EquipmentExceptionReport::getSignId,entity.getSignIds());
  86 + }
  87 + return list(wrapper);
84 } 88 }
85 // @Override 89 // @Override
86 // public List<EquipmentExceptionReport> listOfSelect(EquipmentExceptionReport entity) { 90 // public List<EquipmentExceptionReport> listOfSelect(EquipmentExceptionReport entity) {