工作修改
This commit is contained in:
+32
-1
@@ -25,8 +25,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
@@ -115,8 +119,35 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
|
||||
if(Objects.isNull(payWorkingGroupOld)){
|
||||
throw new JeroBootException("工作组不存在!");
|
||||
}
|
||||
String str = payWorkingGroupOld.getWorkingGroupProject() + "-副本";
|
||||
LambdaQueryWrapper<PayWorkingGroup> queryPayWorkingGroup = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroup.like(PayWorkingGroup::getWorkingGroupProject,str);
|
||||
List<PayWorkingGroup> listPayWorkingGroup = payWorkingGroupService.list(queryPayWorkingGroup);
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroup)){
|
||||
String rex = "^[0-9]*[1-9][0-9]*$";
|
||||
List<Integer> list = new ArrayList<>();
|
||||
String finalStr = str;
|
||||
listPayWorkingGroup.forEach(p->{
|
||||
String project = p.getWorkingGroupProject();
|
||||
if(!StringUtils.isEmpty(project) && !Objects.equals(p.getId(),payWorkingGroupOld.getId())){
|
||||
String projectNew = project.substring(finalStr.length());
|
||||
Pattern pa = Pattern.compile(rex);
|
||||
Matcher m = pa.matcher(projectNew);
|
||||
if (m.find()){
|
||||
list.add(Integer.parseInt(projectNew));
|
||||
}
|
||||
}
|
||||
});
|
||||
if(!CollectionUtils.isEmpty(list)){
|
||||
int m = list.stream().max(Comparator.comparing(Integer::intValue)).get();
|
||||
str = str + (m + 1);
|
||||
}
|
||||
}else{
|
||||
str = str + 1;
|
||||
}
|
||||
|
||||
payWorkingGroupOld.setId(null);
|
||||
payWorkingGroupOld.setWorkingGroupProject(payWorkingGroupOld.getWorkingGroupProject() + "-副本");
|
||||
payWorkingGroupOld.setWorkingGroupProject(str);
|
||||
payWorkingGroupOld.setCreateBy(null);
|
||||
payWorkingGroupOld.setCreateTime(null);
|
||||
payWorkingGroupOld.setUpdateBy(null);
|
||||
|
||||
Reference in New Issue
Block a user