|
|
@@ -156,8 +156,6 @@ public class SubCoHeadServiceListPlugin extends AbstractListPlugin implements Pl
|
|
|
//查询党政履历
|
|
|
// nckd_hrpi_partyposh
|
|
|
QueryFieldBuilder partyPoshFieldBuilder = QueryFieldBuilder.create()
|
|
|
- .add(MasConstant.STARTDATE)
|
|
|
- .add(MasConstant.ENDDATE)
|
|
|
.addIdNumberName(MasConstant.NCKD_PAYUNIT)
|
|
|
//变动时间
|
|
|
.add(MasConstant.NCKD_CHANGETIME)
|
|
|
@@ -194,11 +192,12 @@ public class SubCoHeadServiceListPlugin extends AbstractListPlugin implements Pl
|
|
|
// 筛选出在当年时间范围内的记录,然后取STARTDATE最新的那一条
|
|
|
Optional<DynamicObject> latestRecord = records.stream()
|
|
|
.filter(record -> {
|
|
|
- Date startDate = record.getDate(MasConstant.STARTDATE);
|
|
|
- Date endDate = record.getDate(MasConstant.ENDDATE);
|
|
|
+ if(record.getDate(MasConstant.NCKD_CHANGETIME) == null){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ LocalDateTime changeTime = DateUtil.toLocalDateTime(record.getDate(MasConstant.NCKD_CHANGETIME));
|
|
|
// 判断记录是否在当年范围内
|
|
|
- return startDate != null && !startDate.after(endOfYear) &&
|
|
|
- (endDate == null || !endDate.before(startOfYear));
|
|
|
+ return changeTime.getYear() == beginYear.getYear();
|
|
|
})
|
|
|
.max(Comparator.comparing(record -> record.getDate(MasConstant.STARTDATE),
|
|
|
Comparator.nullsFirst(Comparator.naturalOrder())));
|