|
|
@@ -149,17 +149,17 @@ public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, Block
|
|
149
|
149
|
try {
|
|
150
|
150
|
if (ObjUtil.isNull(data.getStatDate())) {
|
|
151
|
151
|
failureNum++;
|
|
152
|
|
- failureMsg.append("<br/>" + failureNum + "、日期不能为空");
|
|
|
152
|
+ failureMsg.append("<br/>" + failureNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShiftDesc() + "】日期不能为空");
|
|
153
|
153
|
continue;
|
|
154
|
154
|
}
|
|
155
|
155
|
if (ObjUtil.isNull(data.getDutyBrigadeId()) || ObjUtil.isNull(data.getDutyBrigadeName())) {
|
|
156
|
156
|
failureNum++;
|
|
157
|
|
- failureMsg.append("<br/>" + failureNum + "、当班大队不能为空");
|
|
|
157
|
+ failureMsg.append("<br/>" + failureNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShiftDesc() + "】当班大队不能为空");
|
|
158
|
158
|
continue;
|
|
159
|
159
|
}
|
|
160
|
160
|
if (ObjUtil.isNull(data.getShift())) {
|
|
161
|
161
|
failureNum++;
|
|
162
|
|
- failureMsg.append("<br/>" + failureNum + "、班次不能为空");
|
|
|
162
|
+ failureMsg.append("<br/>" + failureNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShiftDesc() + "】班次不能为空");
|
|
163
|
163
|
continue;
|
|
164
|
164
|
}
|
|
165
|
165
|
|
|
|
@@ -175,7 +175,7 @@ public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, Block
|
|
175
|
175
|
data.setCreateTime(DateUtils.getNowDate());
|
|
176
|
176
|
blockedRateMapper.insertBlockedRate(data);
|
|
177
|
177
|
successNum++;
|
|
178
|
|
- successMsg.append("<br/>" + successNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShift() + "】导入成功");
|
|
|
178
|
+ successMsg.append("<br/>" + successNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShiftDesc() + "】导入成功");
|
|
179
|
179
|
} else if (isUpdateSupport) {
|
|
180
|
180
|
// 更新
|
|
181
|
181
|
BlockedRate old = existingList.get(0);
|
|
|
@@ -183,14 +183,14 @@ public class BlockedRateServiceImpl extends ServiceImpl<BlockedRateMapper, Block
|
|
183
|
183
|
data.setUpdateTime(DateUtils.getNowDate());
|
|
184
|
184
|
blockedRateMapper.updateBlockedRate(data);
|
|
185
|
185
|
successNum++;
|
|
186
|
|
- successMsg.append("<br/>" + successNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShift() + "】更新成功");
|
|
|
186
|
+ successMsg.append("<br/>" + successNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShiftDesc() + "】更新成功");
|
|
187
|
187
|
} else {
|
|
188
|
188
|
failureNum++;
|
|
189
|
|
- failureMsg.append("<br/>" + failureNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShift() + "】已存在");
|
|
|
189
|
+ failureMsg.append("<br/>" + failureNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShiftDesc() + "】已存在");
|
|
190
|
190
|
}
|
|
191
|
191
|
} catch (Exception e) {
|
|
192
|
192
|
failureNum++;
|
|
193
|
|
- String msg = "<br/>" + failureNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShift() + "】导入失败:";
|
|
|
193
|
+ String msg = "<br/>" + failureNum + "、日期【" + data.getStatDate() + "】、当班大队【" + data.getDutyBrigadeName() + "】、班次【" + data.getShiftDesc() + "】导入失败:";
|
|
194
|
194
|
failureMsg.append(msg + e.getMessage());
|
|
195
|
195
|
}
|
|
196
|
196
|
}
|