|
@@ -917,20 +917,15 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
// 提取现有的采集附件数据
|
|
|
List<OrderRepairDetail> fs = orderRepairDetailService.lambdaQuery()
|
|
|
.eq(OrderRepairDetail::getOrderBaseId,order.getId()).list();
|
|
|
- if (CollectionUtils.isEmpty(fs)){
|
|
|
+ if (CollectionUtils.isNotEmpty(fs)){
|
|
|
fs.stream().forEach(event->{
|
|
|
wxjsguid.add(event.getBrandWxjsguid());
|
|
|
});
|
|
|
-
|
|
|
fs.clear();
|
|
|
}
|
|
|
|
|
|
- log.info("测试a {}",JSONObject.toJSONString(wxjsguid));
|
|
|
|
|
|
for (ItfTblWxjsJyktDownload item :jykts){
|
|
|
- log.info("测试b {}",JSONObject.toJSONString(wxjsguid));
|
|
|
- log.info("测试c {}",item.getWxjsguid());
|
|
|
-
|
|
|
// 生成维修数据采集明细表数据+三子表数据信息 暂时忽略更新,无新增
|
|
|
if (!wxjsguid.contains(item.getWxjsguid())){
|
|
|
getorderRepairDetail(ords, its, order, op, item);
|
|
@@ -1085,7 +1080,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
List<OrderDetailFile> fs = orderDetailFileService.lambdaQuery()
|
|
|
.select(OrderDetailFile::getFjguid,OrderDetailFile::getFileType)
|
|
|
.eq(OrderDetailFile::getOrderBaseId,order.getId()).list();
|
|
|
- if (CollectionUtils.isEmpty(fs)){
|
|
|
+ if (CollectionUtils.isNotEmpty(fs)){
|
|
|
fs.stream().forEach(event->{
|
|
|
fsFjguid.add(event.getFjguid());
|
|
|
});
|
|
@@ -1152,7 +1147,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
List<OrderInstallDetailCode> codes = orderInstallDetailCodeService.lambdaQuery()
|
|
|
.select(OrderInstallDetailCode::getTmguid,OrderInstallDetailCode::getStatus)
|
|
|
.eq(OrderInstallDetailCode::getOrderBaseId, order.getId()).list();
|
|
|
- if (CollectionUtils.isEmpty(codes)){
|
|
|
+ if (CollectionUtils.isNotEmpty(codes)){
|
|
|
codes.stream().forEach(event->{
|
|
|
tmguidS.add(event.getTmguid());
|
|
|
});
|
|
@@ -1201,7 +1196,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
List<OrderDetailFile> fs = orderDetailFileService.lambdaQuery()
|
|
|
.select(OrderDetailFile::getFjguid,OrderDetailFile::getFileType)
|
|
|
.eq(OrderDetailFile::getOrderBaseId,order.getId()).list();
|
|
|
- if (CollectionUtils.isEmpty(fs)){
|
|
|
+ if (CollectionUtils.isNotEmpty(fs)){
|
|
|
fs.stream().forEach(event->{
|
|
|
fsFjguid.add(event.getFjguid());
|
|
|
});
|
|
@@ -1255,7 +1250,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
|
|
|
List<OrderDetailFile> fs = orderDetailFileService.lambdaQuery()
|
|
|
.select(OrderDetailFile::getFjguid,OrderDetailFile::getFileType)
|
|
|
.eq(OrderDetailFile::getOrderBaseId,order.getId()).list();
|
|
|
- if (CollectionUtils.isEmpty(fs)){
|
|
|
+ if (CollectionUtils.isNotEmpty(fs)){
|
|
|
fs.stream().forEach(event->{
|
|
|
fsFjguid.add(event.getFjguid());
|
|
|
});
|