| ... |
... |
@@ -228,6 +228,7 @@ public class ActivityReader extends DataReader<Activity> { |
|
228
|
228
|
String vesselActivityCode = resultSet.getString(13);
|
|
229
|
229
|
Object setCountObject = resultSet.getObject(14);
|
|
230
|
230
|
Integer setCount = setCountObject == null ? null : ((Number) setCountObject).intValue();
|
|
|
231
|
+ String schoolTypeCode = resultSet.getString(15);
|
|
231
|
232
|
switch (vesselActivityCode) {
|
|
232
|
233
|
case "0":
|
|
233
|
234
|
// SetSuccessStatus=0 + ReasonForNullSet=0 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
|
| ... |
... |
@@ -235,18 +236,24 @@ public class ActivityReader extends DataReader<Activity> { |
|
235
|
236
|
entity.setReasonForNullSet(dataContext.getReasonForNullSet0());
|
|
236
|
237
|
// See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
237
|
238
|
entity.setSetCount(setCount);
|
|
|
239
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485
|
|
|
240
|
+ entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode));
|
|
238
|
241
|
break;
|
|
239
|
242
|
case "1":
|
|
240
|
243
|
// SetSuccessStatus=1 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
|
|
241
|
244
|
entity.setSetSuccessStatus(dataContext.getSetSuccessStatus1());
|
|
242
|
245
|
// See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
243
|
246
|
entity.setSetCount(setCount);
|
|
|
247
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485
|
|
|
248
|
+ entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode));
|
|
244
|
249
|
break;
|
|
245
|
250
|
case "2":
|
|
246
|
251
|
// SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091)
|
|
247
|
252
|
entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2());
|
|
248
|
253
|
// See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
249
|
254
|
entity.setSetCount(setCount);
|
|
|
255
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485
|
|
|
256
|
+ entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode));
|
|
250
|
257
|
break;
|
|
251
|
258
|
case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429)
|
|
252
|
259
|
// SetSuccessStatus=2
|
| ... |
... |
@@ -255,11 +262,11 @@ public class ActivityReader extends DataReader<Activity> { |
|
255
|
262
|
entity.addObservedSystem(dataContext.getObservedSystem110());
|
|
256
|
263
|
// See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610
|
|
257
|
264
|
entity.setSetCount(setCount);
|
|
|
265
|
+ // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485
|
|
|
266
|
+ entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode));
|
|
258
|
267
|
break;
|
|
259
|
268
|
}
|
|
260
|
269
|
entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode));
|
|
261
|
|
- String schoolTypeCode = resultSet.getString(15);
|
|
262
|
|
- entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode));
|
|
263
|
270
|
Object fDonOrg = resultSet.getObject(16);
|
|
264
|
271
|
if (fDonOrg != null) {
|
|
265
|
272
|
boolean originalDataModified = Objects.equals(fDonOrg + "", "0");
|