From b1e84b26d0b0f254d5e000092ce9f0ef56a1304c Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 27 Jun 2024 12:06:11 +0800
Subject: [PATCH] 湖北水库：施工：管理员查询所有上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxStepServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxStepServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxStepServiceImpl.java
index 61a7e6a..ecc4a29 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxStepServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxStepServiceImpl.java
@@ -104,7 +104,7 @@
SgGxRoleDO sgGxRoleDO=new SgGxRoleDO();
sgGxRoleDO.setGxDeviceType(sgGxRoleVO.getGxDeviceType());
sgGxRoleDO.setGxStepId(sgGxRoleVO.getGxStepId());
- sgGxRoleDO.setRoleId(Long.valueOf(roleIds.get(i)));
+ sgGxRoleDO.setRoleId(roleIds.get(i));
sgGxRoleDO.setSgOrder(sgGxRoleVO.getOrders().get(i));
sgGxRoles.add(sgGxRoleDO);
}
@@ -120,7 +120,7 @@
@Transactional
public void updateSgGxRole(SgGxRoleVO sgGxRoleVO){
String gxStepId = sgGxRoleVO.getGxStepId();
- List<SgProgressReportDO> reportDOS = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(s -> s.getGxStepId(), gxStepId).list();
+ List<SgProgressReportDO> reportDOS = new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getGxStepId, gxStepId).list();
List<SgGxRoleDO> list = new LambdaQueryChainWrapper<>(sgGxRoleMapper).eq(SgGxRoleDO::getGxStepId, gxStepId).orderByAsc(SgGxRoleDO::getSgOrder).list();
List<String> roles = list.stream().map(SgGxRoleDO::getRoleId).map(Object::toString).collect(Collectors.toList());
List<Integer> orders = list.stream().map(SgGxRoleDO::getSgOrder).collect(Collectors.toList());
@@ -151,7 +151,7 @@
SgGxRoleDO sgGxRoleDO=new SgGxRoleDO();
sgGxRoleDO.setGxDeviceType(sgGxRoleVO.getGxDeviceType());
sgGxRoleDO.setGxStepId(sgGxRoleVO.getGxStepId());
- sgGxRoleDO.setRoleId(Long.valueOf(roleIds.get(i)));
+ sgGxRoleDO.setRoleId(roleIds.get(i));
sgGxRoleDO.setSgOrder(sgGxRoleVO.getOrders().get(i));
sgGxRoles.add(sgGxRoleDO);
}
--
Gitblit v1.9.3