|
@@ -376,19 +376,16 @@ public class ProcurementWeighingTicketServiceImpl |
|
@@ -376,19 +376,16 @@ public class ProcurementWeighingTicketServiceImpl |
|
376
|
Object examStatusObj = map.get("examStatus");
|
376
|
Object examStatusObj = map.get("examStatus");
|
|
377
|
String examStatus = examStatusObj == null ? null : String.valueOf(examStatusObj);
|
377
|
String examStatus = examStatusObj == null ? null : String.valueOf(examStatusObj);
|
|
378
|
|
378
|
|
|
379
|
- // 业务ID(过磅码单ID),兼容前端流程回调 variables 子 map 包裹
|
|
|
|
380
|
String bizId = null;
|
379
|
String bizId = null;
|
|
381
|
- Object bizIdObj = map.get("bizId");
|
|
|
|
382
|
- if (bizIdObj != null) {
|
380
|
+ //主键
|
|
|
|
381
|
+ Object i = map.get("id");
|
|
|
|
382
|
+ bizId = String.valueOf(i);
|
|
|
|
383
|
+ log.info("bizId====" + bizId);
|
|
|
|
384
|
+ // 业务ID(过磅码单ID),兼容前端流程回调 variables 子 map 包裹
|
|
|
|
385
|
+
|
|
|
|
386
|
+ if (bizId == null) {
|
|
|
|
387
|
+ Object bizIdObj = map.get("bizId");
|
|
383
|
bizId = String.valueOf(bizIdObj);
|
388
|
bizId = String.valueOf(bizIdObj);
|
|
384
|
- } else {
|
|
|
|
385
|
- Object varsObj = map.get("variables");
|
|
|
|
386
|
- if (varsObj instanceof Map) {
|
|
|
|
387
|
- Object bizIdInVar = ((Map<?, ?>) varsObj).get("bizId");
|
|
|
|
388
|
- if (bizIdInVar != null) {
|
|
|
|
389
|
- bizId = String.valueOf(bizIdInVar);
|
|
|
|
390
|
- }
|
|
|
|
391
|
- }
|
|
|
|
392
|
}
|
389
|
}
|
|
393
|
|
390
|
|
|
394
|
if (StringUtil.isBlank(bizId)) {
|
391
|
if (StringUtil.isBlank(bizId)) {
|
|
@@ -410,9 +407,6 @@ public class ProcurementWeighingTicketServiceImpl |
|
@@ -410,9 +407,6 @@ public class ProcurementWeighingTicketServiceImpl |
|
410
|
.set(inspectorNode, ProcurementWeighingTicket::getQualityInspectorName, SecurityUtil.getCurrentUser().getName())
|
407
|
.set(inspectorNode, ProcurementWeighingTicket::getQualityInspectorName, SecurityUtil.getCurrentUser().getName())
|
|
411
|
.set(inspectorNode, ProcurementWeighingTicket::getQualityInspectorId, SecurityUtil.getCurrentUser().getId())
|
408
|
.set(inspectorNode, ProcurementWeighingTicket::getQualityInspectorId, SecurityUtil.getCurrentUser().getId())
|
|
412
|
.eq(ProcurementWeighingTicket::getId, bizId));
|
409
|
.eq(ProcurementWeighingTicket::getId, bizId));
|
|
413
|
-
|
|
|
|
414
|
- // 回填操作日志
|
|
|
|
415
|
- OpLogUtil.setVariable("id", bizId);
|
|
|
|
416
|
}
|
410
|
}
|
|
417
|
}
|
411
|
}
|
|
418
|
} catch (Exception ex) {
|
412
|
} catch (Exception ex) {
|