From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 249dd00..add542c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -246,7 +246,7 @@
info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode());
info.setSenderId(userId);
info.setViewStatus(false);
- info.setJumpPath("b1-inspect-order");
+ info.setJumpPath("b1-inspection-order");
info.setConsigneeId(user.getId());
notificationArrayList.add(info);
}
@@ -278,7 +278,7 @@
info.setContent("鎮ㄦ湁涓�鏉℃楠岃鍗曞緟瀹℃牳娑堟伅,璁㈠崟鐨勫閮ㄧ紪鍙锋槸:" + insOrder.getOutEntrustCode());
info.setSenderId(userId);
info.setViewStatus(false);
- info.setJumpPath("b1-inspect-order");
+ info.setJumpPath("b1-inspection-order");
info.setConsigneeId(user.getId());
notificationArrayList.add(info);
}
@@ -344,7 +344,7 @@
info.setSenderId(userId);
info.setConsigneeId(insOrder.getIssueUser());
info.setViewStatus(false);
- info.setJumpPath("b1-inspect-order");
+ info.setJumpPath("b1-inspection-order");
informationNotificationService.addInformationNotification(info);
}
return insOrder.getId();
@@ -461,8 +461,10 @@
.eq(InsProductResult::getInsProductId, insProduct.getId()).isNull(InsProductResult::getNum));
insProduct.setInsProductResult(insProductResult);
}
- BeanUtils.copyProperties(insSample,sampleProductDto);
- sampleProductDto.setInsProduct(insProducts);
+ SampleProductDto dto = new SampleProductDto();
+ dto.setInsProduct(insProducts);
+ BeanUtils.copyProperties(insSample,dto);
+ sampleProductDto=dto;
}
List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());
List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
--
Gitblit v1.9.3