Commit 66d3aac8 authored by hanbing's avatar hanbing

[update] 快速特勤,修改分组入参改为特勤ID

parent 1e6b905b
...@@ -656,8 +656,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService { ...@@ -656,8 +656,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
Integer specialServiceId = specialServiceIdBO.getId(); Integer specialServiceId = specialServiceIdBO.getId();
SpecialServicePO specialServicePO = specialServiceMapper.selectById(specialServiceId); SpecialServicePO specialServicePO = specialServiceMapper.selectById(specialServiceId);
String specialServiceName = specialServicePO.getName(); groupListVO.setSpecialServiceId(specialServiceId);
groupListVO.setSpecialServiceName(specialServiceName);
List<GroupListVO.GroupListElement> groupList = buildGroupList(specialServicePO); List<GroupListVO.GroupListElement> groupList = buildGroupList(specialServicePO);
groupListVO.setGroupList(groupList); groupListVO.setGroupList(groupList);
...@@ -668,9 +667,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService { ...@@ -668,9 +667,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
@Override @Override
@Transactional @Transactional
public void updateGroup(GroupListVO groupListVO) { public void updateGroup(GroupListVO groupListVO) {
String specialServiceName = groupListVO.getSpecialServiceName(); Integer specialServiceId = groupListVO.getSpecialServiceId();
SpecialServicePO specialServicePO = specialServiceMapper.selectByName(specialServiceName);
Integer specialServiceId = specialServicePO.getId();
List<GroupListVO.GroupListElement> groupList = groupListVO.getGroupList(); List<GroupListVO.GroupListElement> groupList = groupListVO.getGroupList();
for (GroupListVO.GroupListElement groupListElement : groupList) { for (GroupListVO.GroupListElement groupListElement : groupList) {
...@@ -695,9 +692,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService { ...@@ -695,9 +692,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
@Override @Override
public void autoUnlock(GroupListVO groupListVO) { public void autoUnlock(GroupListVO groupListVO) {
String specialServiceName = groupListVO.getSpecialServiceName(); Integer specialServiceId = groupListVO.getSpecialServiceId();
SpecialServicePO specialServicePO = specialServiceMapper.selectByName(specialServiceName);
Integer specialServiceId = specialServicePO.getId();
List<GroupListVO.GroupListElement> groupList = groupListVO.getGroupList(); List<GroupListVO.GroupListElement> groupList = groupListVO.getGroupList();
for (GroupListVO.GroupListElement groupListElement : groupList) { for (GroupListVO.GroupListElement groupListElement : groupList) {
...@@ -716,7 +711,6 @@ public class SpecialServiceServiceImpl implements SpecialServiceService { ...@@ -716,7 +711,6 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
Integer specialServiceId = specialServicePO.getId(); Integer specialServiceId = specialServicePO.getId();
List<SpecialServiceCrossPO> specialServiceCrossList = List<SpecialServiceCrossPO> specialServiceCrossList =
specialServiceCrossMapper.selectBySpecialServiceId(specialServiceId); specialServiceCrossMapper.selectBySpecialServiceId(specialServiceId);
int crossNums = specialServiceCrossList.size();
Map<String, List<SpecialServiceCrossPO>> map = specialServiceCrossList.stream() Map<String, List<SpecialServiceCrossPO>> map = specialServiceCrossList.stream()
.collect(Collectors.groupingBy(SpecialServiceCrossPO::getGroupName)); .collect(Collectors.groupingBy(SpecialServiceCrossPO::getGroupName));
......
...@@ -15,8 +15,8 @@ import java.util.List; ...@@ -15,8 +15,8 @@ import java.util.List;
@Data @Data
@ApiModel(value = "GroupListVO") @ApiModel(value = "GroupListVO")
public class GroupListVO { public class GroupListVO {
@ApiModelProperty(value = "特勤名称",notes = "") @ApiModelProperty(value = "特勤ID",notes = "")
private String specialServiceName; private Integer specialServiceId;
private List<GroupListElement> groupList; private List<GroupListElement> groupList;
@NoArgsConstructor @NoArgsConstructor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment