From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxStepServiceImpl.java | 11 ++++++++---
1 files changed, 8 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..91fef81 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);
}
@@ -170,4 +170,9 @@
return sgGxRoleMapper.getSgGxRoles(gxDeviceType, gxStepId);
}
+
+ @Override
+ public List<SgGxStepDO> sgGxStepList() {
+ return sgGxStepMapper.getDEviceGXtwo();
+ }
}
--
Gitblit v1.9.3