diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index bd15e46..eee4b35 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -118,4 +118,10 @@ //扫描匹配使用参数 @JSONField(serialize = false) private String labelBind; + @JSONField(serialize = false) + private String orderCode; + public String getOrderCode() { + return orderNo; + } + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java index bd15e46..eee4b35 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/labExecutive/SampleLabExecutiveListResponse.java @@ -118,4 +118,10 @@ //扫描匹配使用参数 @JSONField(serialize = false) private String labelBind; + @JSONField(serialize = false) + private String orderCode; + public String getOrderCode() { + return orderNo; + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java index 963d150..ff60a24 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java @@ -189,7 +189,7 @@ public MessageInfoCountResponse infoCount(MessageInfoCountRequest request) { //未处理待审批数量 List resultList = new ArrayList<>(); - Arrays.stream(ApplyFromIdEnum.values()).parallel().forEach(applyFromIdEnum -> { + Arrays.stream(ApplyFromIdEnum.values()).forEach(applyFromIdEnum -> { List toBeApprovedList = baseApprovalService.getToBeApprovedList(applyFromIdEnum.getCode()); if(CollectionUtils.isEmpty(toBeApprovedList)){ return;