|
|
@ -190,6 +190,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> { |
|
|
|
if (line == null) { |
|
|
|
throw new DfException("巡查路线不存在"); |
|
|
|
} |
|
|
|
record = Optional.ofNullable(BeanCopyUtils.copy(dfRecord, DfRecord.class)).orElse(record); |
|
|
|
int itemCount = dfCheckingItemMapper.selectCount(Wrappers.<DfCheckingItem>lambdaQuery().eq(DfCheckingItem::getXcId, line.getXcId())); |
|
|
|
record.setHandleStatus(handleStatus(dfRecord)); |
|
|
|
record.setRemaining((long) itemCount - dfRecord.getItems().size()); |
|
|
@ -199,7 +200,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> { |
|
|
|
.collect(Collectors.toList()); |
|
|
|
recordItemService.saveOrUpdateBatch(items); |
|
|
|
} |
|
|
|
this.baseMapper.updateById(BeanCopyUtils.copy(dfRecord, DfRecord.class)); |
|
|
|
this.baseMapper.updateById(record); |
|
|
|
return dfRecord; |
|
|
|
} |
|
|
|
|
|
|
|