|
@@ -150,13 +150,15 @@ public class WorkerWarrantyLogic {
|
|
.in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getType().equals(1), WorkerWarranty::getWebsitId, adminUser.getAdminWebsitIds())
|
|
.in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getType().equals(1), WorkerWarranty::getWebsitId, adminUser.getAdminWebsitIds())
|
|
.list();
|
|
.list();
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
//网点名称
|
|
//网点名称
|
|
Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
|
|
Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
|
|
.eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
.eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
.in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getType().equals(1), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
|
|
.in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getType().equals(1), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
|
|
.eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
|
|
.eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
|
|
.list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
|
|
.list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
|
|
-
|
|
|
|
|
|
+ log.info("网点");
|
|
|
|
|
|
//网点名称
|
|
//网点名称
|
|
Map<String, User> userMap = userService.lambdaQuery()
|
|
Map<String, User> userMap = userService.lambdaQuery()
|
|
@@ -166,6 +168,8 @@ public class WorkerWarrantyLogic {
|
|
.isNotNull(User::getMobile)
|
|
.isNotNull(User::getMobile)
|
|
.list().stream().collect(Collectors.toMap(User::getMobile, Function.identity()));
|
|
.list().stream().collect(Collectors.toMap(User::getMobile, Function.identity()));
|
|
|
|
|
|
|
|
+ log.info("用户");
|
|
|
|
+
|
|
for (int i = 0; i < objects.size(); i++) {
|
|
for (int i = 0; i < objects.size(); i++) {
|
|
int rowIndex = i + 2;
|
|
int rowIndex = i + 2;
|
|
List<Object> row = (List<Object>) objects.get(i);
|
|
List<Object> row = (List<Object>) objects.get(i);
|