完善关键零部件绑定关系管理
This commit is contained in:
+40
-2
@@ -58,6 +58,24 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
|
|||||||
Integer pageSize, HttpServletRequest req) {
|
Integer pageSize, HttpServletRequest req) {
|
||||||
QueryWrapper<LawsPartRelevance> queryWrapper =
|
QueryWrapper<LawsPartRelevance> queryWrapper =
|
||||||
QueryGenerator.initQueryWrapper(lawsPartRelevance, req.getParameterMap());
|
QueryGenerator.initQueryWrapper(lawsPartRelevance, req.getParameterMap());
|
||||||
|
if(!StringUtils.isBlank(lawsPartRelevance.getRegPartNameCn())){
|
||||||
|
LambdaQueryWrapper<LawsPartPmmPartitionInfo> queryLawsPartPmmPartitionInfo = new LambdaQueryWrapper<>();
|
||||||
|
queryLawsPartPmmPartitionInfo.like(LawsPartPmmPartitionInfo::getRegPartNameCn,lawsPartRelevance.getRegPartNameCn());
|
||||||
|
List<LawsPartPmmPartitionInfo> list = lawsPartPmmPartitionInfoService.list(queryLawsPartPmmPartitionInfo);
|
||||||
|
if(!CollectionUtils.isEmpty(list)){
|
||||||
|
List<String> listFndGpc = list.stream().map(LawsPartPmmPartitionInfo::getFndGpc).collect(Collectors.toList());
|
||||||
|
queryWrapper.and(o->{
|
||||||
|
for (int i = 0; i < listFndGpc.size(); i++) {
|
||||||
|
o.like("fnd_gpc",listFndGpc.get(i));
|
||||||
|
if(listFndGpc.size() - 1 != i){
|
||||||
|
o.or();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
queryWrapper.eq("id","");
|
||||||
|
}
|
||||||
|
}
|
||||||
Page<LawsPartRelevance> page = new Page<>(pageNo, pageSize);
|
Page<LawsPartRelevance> page = new Page<>(pageNo, pageSize);
|
||||||
IPage<LawsPartRelevance> re = page(page, queryWrapper);
|
IPage<LawsPartRelevance> re = page(page, queryWrapper);
|
||||||
List<LawsPartRelevance> list = re.getRecords();
|
List<LawsPartRelevance> list = re.getRecords();
|
||||||
@@ -220,6 +238,26 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
|
|||||||
if(!StringUtils.isEmpty(g.toString())){
|
if(!StringUtils.isEmpty(g.toString())){
|
||||||
s.append(g.toString());
|
s.append(g.toString());
|
||||||
}
|
}
|
||||||
|
if(!StringUtils.isBlank(lawsPartRelevance.getRegPartNameEn())
|
||||||
|
&& lawsPartRelevance.getRegPartNameEn().length() > 50){
|
||||||
|
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
||||||
|
"关键零部件名称(英文) Maximum length 50," : "关键零部件名称(英文)最大长度为50,");
|
||||||
|
}
|
||||||
|
if(!StringUtils.isBlank(lawsPartRelevance.getSystemCode())
|
||||||
|
&& lawsPartRelevance.getSystemCode().length() > 50){
|
||||||
|
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
||||||
|
"功能系统码 Maximum length 50," : "功能系统码最大长度为50,");
|
||||||
|
}
|
||||||
|
if(!StringUtils.isBlank(lawsPartRelevance.getRemark())
|
||||||
|
&& lawsPartRelevance.getRemark().length() > 50){
|
||||||
|
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
||||||
|
"备注 Maximum length 50," : "备注最大长度为50,");
|
||||||
|
}
|
||||||
|
if(!StringUtils.isBlank(lawsPartRelevance.getDecisionRequirement())
|
||||||
|
&& lawsPartRelevance.getDecisionRequirement().length() > 50){
|
||||||
|
s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
||||||
|
"技术特性判定要求 Maximum length 500," : "技术特性判定要求最大长度为500,");
|
||||||
|
}
|
||||||
if(!StringUtils.isBlank(lawsPartRelevance.getRegPartNameCn())){
|
if(!StringUtils.isBlank(lawsPartRelevance.getRegPartNameCn())){
|
||||||
// 验证关键零部件名称是否正确
|
// 验证关键零部件名称是否正确
|
||||||
if(CollectionUtils.isEmpty(lawsPartPmmPartitionInfoList)){
|
if(CollectionUtils.isEmpty(lawsPartPmmPartitionInfoList)){
|
||||||
@@ -252,7 +290,7 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
|
|||||||
long l = listOld.stream().filter(o->Objects.equals(o.getFndGpc(), code)).count();
|
long l = listOld.stream().filter(o->Objects.equals(o.getFndGpc(), code)).count();
|
||||||
if(l > 0){
|
if(l > 0){
|
||||||
s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
||||||
"名称与功能系统码 already exists," : "名称与功能系统码已存在,"));
|
"关键零部件名称与功能系统码 already exists," : "关键零部件名称与功能系统码已存在,"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 校验重复
|
// 校验重复
|
||||||
@@ -260,7 +298,7 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
|
|||||||
long l = setAlready.stream().filter(o->Objects.equals(o,code)).count();
|
long l = setAlready.stream().filter(o->Objects.equals(o,code)).count();
|
||||||
if(l > 0){
|
if(l > 0){
|
||||||
s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
|
||||||
"名称与功能系统码 duplicate," : "名称与功能系统码重复,"));
|
"关键零部件名称与功能系统码 duplicate," : "关键零部件名称与功能系统码重复,"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setAlready.add(code);
|
setAlready.add(code);
|
||||||
|
|||||||
Reference in New Issue
Block a user