guzijian / bsth-alcohol-sign · Commits

Commit c37540536acf1aa622999a21d8b2f534fe6d0ff5

Authored by guzijian
1 parent 29fa9984

fix: 修改配置配置名称

Inline Side-by-side
Showing 1 changed file with 18 additions and 18 deletions
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ExportReportViewResponseVo.java
  View file @c375405
@@ -64,8 +64,8 @@ public class ExportReportViewResponseVo { @@ -64,8 +64,8 @@ public class ExportReportViewResponseVo {
64 @ColumnWidth(12) 64 @ColumnWidth(12)
65 private String alcoholStringIn; 65 private String alcoholStringIn;
66 66
67 - @ApiModelProperty("酒精测试含量")  
68 - @ExcelProperty(value = "酒精测试含量") 67 + @ApiModelProperty("签到酒精测试含量")
  68 + @ExcelProperty(value = "签到酒精测试含量")
69 @ColumnWidth(12) 69 @ColumnWidth(12)
70 private BigDecimal alcoholIntakeIn; 70 private BigDecimal alcoholIntakeIn;
71 71
@@ -87,8 +87,8 @@ public class ExportReportViewResponseVo { @@ -87,8 +87,8 @@ public class ExportReportViewResponseVo {
87 @ColumnWidth(12) 87 @ColumnWidth(12)
88 private String alcoholStringOut; 88 private String alcoholStringOut;
89 89
90 - @ApiModelProperty("酒精测试含量")  
91 - @ExcelProperty(value = "酒精测试含量") 90 + @ApiModelProperty("签退酒精测试含量")
  91 + @ExcelProperty(value = "签退酒精测试含量")
92 @ColumnWidth(12) 92 @ColumnWidth(12)
93 private BigDecimal alcoholIntakeOut; 93 private BigDecimal alcoholIntakeOut;
94 94
@@ -110,13 +110,13 @@ public class ExportReportViewResponseVo { @@ -110,13 +110,13 @@ public class ExportReportViewResponseVo {
110 @ColumnWidth(20) 110 @ColumnWidth(20)
111 private Date secondActualSignInTime; 111 private Date secondActualSignInTime;
112 112
113 - @ApiModelProperty("是否酒精测试")  
114 - @ExcelProperty(value = "是否酒精测试") 113 + @ApiModelProperty("分班签到是否酒精测试")
  114 + @ExcelProperty(value = "分班签到是否酒精测试")
115 @ColumnWidth(12) 115 @ColumnWidth(12)
116 private String secondAlcoholStringIn; 116 private String secondAlcoholStringIn;
117 117
118 - @ApiModelProperty("酒精测试含量")  
119 - @ExcelProperty(value = "酒精测试含量") 118 + @ApiModelProperty("分班签到酒精测试含量")
  119 + @ExcelProperty(value = "分班签到酒精测试含量")
120 @ColumnWidth(12) 120 @ColumnWidth(12)
121 private BigDecimal secondAlcoholIntakeIn; 121 private BigDecimal secondAlcoholIntakeIn;
122 122
@@ -135,13 +135,13 @@ public class ExportReportViewResponseVo { @@ -135,13 +135,13 @@ public class ExportReportViewResponseVo {
135 @ColumnWidth(20) 135 @ColumnWidth(20)
136 private Date secondActualSignOutTime; 136 private Date secondActualSignOutTime;
137 137
138 - @ApiModelProperty("是否酒精测试")  
139 - @ExcelProperty(value = "是否酒精测试") 138 + @ApiModelProperty("分班是否酒精测试")
  139 + @ExcelProperty(value = "分班是否酒精测试")
140 @ColumnWidth(12) 140 @ColumnWidth(12)
141 private String secondAlcoholStringOut; 141 private String secondAlcoholStringOut;
142 142
143 - @ApiModelProperty("酒精测试含量")  
144 - @ExcelProperty(value = "酒精测试含量") 143 + @ApiModelProperty("分班签退酒精测试含量")
  144 + @ExcelProperty(value = "分班签退酒精测试含量")
145 @ColumnWidth(12) 145 @ColumnWidth(12)
146 private BigDecimal secondAlcoholIntakeOut; 146 private BigDecimal secondAlcoholIntakeOut;
147 147
@@ -155,18 +155,18 @@ public class ExportReportViewResponseVo { @@ -155,18 +155,18 @@ public class ExportReportViewResponseVo {
155 @ColumnWidth(20) 155 @ColumnWidth(20)
156 private Date scheduleDate; 156 private Date scheduleDate;
157 157
158 - public ExportReportViewResponseVo(List<DriverScheduling> driverSchedulings) {  
159 - BeanUtils.copyProperties(driverSchedulings.get(0), this);  
160 - int size = driverSchedulings.size(); 158 + public ExportReportViewResponseVo(List<DriverScheduling> driverScheduling) {
  159 + BeanUtils.copyProperties(driverScheduling.get(0), this);
  160 + int size = driverScheduling.size();
161 this.setHaveSecondFlagString(size >= 4 ? "有分班":"无分班"); 161 this.setHaveSecondFlagString(size >= 4 ? "有分班":"无分班");
162 if (size <= 3) { 162 if (size <= 3) {
163 - handlerFirst(driverSchedulings, size); 163 + handlerFirst(driverScheduling, size);
164 } 164 }
165 // 有分班 165 // 有分班
166 else { 166 else {
167 // 签到 167 // 签到
168 - handlerFirst(driverSchedulings, 2);  
169 - handlerSecond(driverSchedulings, size); 168 + handlerFirst(driverScheduling, 2);
  169 + handlerSecond(driverScheduling, size);
170 } 170 }
171 } 171 }
172 172