|
@@ -138,10 +138,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
|
|
|
if (orderBase !=null && orderBase.getUploadFlag()){
|
|
|
// 若工单被删除不再同步 不写生成数据
|
|
|
-
|
|
|
- log.info("生成数据时取工单状态值a :"+ orderBase.getId()+">"+orderBase.getOrderStatus());
|
|
|
-
|
|
|
-
|
|
|
// 条件判断
|
|
|
if (!checkPare(ojtutl, orderBase)) {
|
|
|
return Boolean.FALSE;
|
|
@@ -194,7 +190,12 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
Boolean flag = Boolean.TRUE;
|
|
|
detailFiles = orderDetailFileService.lambdaQuery()
|
|
|
.eq(OrderDetailFile::getOrderBaseId, ojtutl.getId()).list();
|
|
|
+
|
|
|
+ log.info("需要生成图片c ");
|
|
|
+
|
|
|
for (OrderDetailFile file:detailFiles){
|
|
|
+ log.info("需要生成图片d ");
|
|
|
+
|
|
|
// 工单号, file的id即附件表的id,uuid统一值
|
|
|
// path未准备上传被忽略
|
|
|
if (StringUtils.isEmpty(file.getFilePath())){
|
|
@@ -284,15 +285,19 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
.one();
|
|
|
|
|
|
if (orderBase !=null && orderBase.getUploadFlag()){
|
|
|
- log.info("生成数据时取工单状态值b:"+ orderBase.getId()+">"+orderBase.getOrderStatus());
|
|
|
-
|
|
|
// 安装工单产品信息,操作日志,完工明细,完工明细附件
|
|
|
// 预约改约-总部短信发送请求表,派服务人员-短信发送请求表 以主表的pgguid统一修改
|
|
|
upPgguid(orderBase);
|
|
|
+
|
|
|
+ log.info("需要生成图片x1 ");
|
|
|
+
|
|
|
// 初始化数据
|
|
|
if (!upInit(ojtutl, CategoryRefmap, orderBase)){
|
|
|
+ log.info("需要生成图片x2 ");
|
|
|
return Boolean.FALSE;
|
|
|
}
|
|
|
+
|
|
|
+ log.info("需要生成图片x3 ");
|
|
|
}
|
|
|
return orderInstallCjOrWg(cjOrWg, brand, ojtutl, CategoryRefmap,orderBase);
|
|
|
}
|
|
@@ -795,8 +800,11 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
upOrderDetailFileOutId(ojtutl);
|
|
|
// 上传图片
|
|
|
uploadOrderDetailFilePiture(ojtutl, CategoryRefmap, orderBase);
|
|
|
+ log.info("需要生成图片a ");
|
|
|
+
|
|
|
return Boolean.FALSE;
|
|
|
} catch (Exception ex) {
|
|
|
+ log.info("需要生成图片b ");
|
|
|
return Boolean.TRUE;
|
|
|
}
|
|
|
}
|
|
@@ -813,7 +821,11 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
|
|
|
detailFiles = orderDetailFileService.lambdaQuery()
|
|
|
.eq(OrderDetailFile::getOrderBaseId, ojtutl.getId()).list();
|
|
|
|
|
|
+ log.info("需要生成图片工单ID {}",ojtutl.getId());
|
|
|
+ log.info("需要生成图片数据 {}",JSONObject.toJSONString(detailFiles));
|
|
|
+
|
|
|
for (OrderDetailFile file:detailFiles){
|
|
|
+ log.info("需要生成图片x ");
|
|
|
// 工单号, file的id即附件表的id,uuid统一值
|
|
|
// path未准备上传被忽略
|
|
|
if (StringUtils.isEmpty(file.getFilePath())){
|