QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:87330

Browse Source
This commit is contained in:
梁琦涛
2024-07-24 09:20:18 +08:00
parent 9428020edf
commit 24342a5746
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+1
View File
@@ -95,6 +95,7 @@ public class LawsMarketStandardDetail implements Serializable {
* 标准英文名称
*/
@ApiModelProperty(value = "标准英文名称")
@NotBlank(message = "标准英文名称不能为空")
@Excel(name = "标准英文名称", width = 15)
private String standardEnglishName;
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+11 -18
View File
@@ -45,10 +45,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -268,12 +265,13 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
private void checkStandard(List<LawsMarketStandardDetail> listIdsStandard, List<String> listStandardIds, List<String> listStandardIdRepeat, LawsMarketStandardDetail p, StringBuilder s) {
if(!StringUtils.isBlank(p.getStandardNumber())){
List<LawsMarketStandardDetail> listStandardNumberData = listIdsStandard.stream().filter(o->
Objects.equals(o.getStandardNumber(),p.getStandardNumber())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStandardNumberData)){
Optional<LawsMarketStandardDetail> op = listIdsStandard.stream().filter(o->
Objects.equals(o.getStandardNumber(),p.getStandardNumber())).findFirst();
if(!op.isPresent()){
s.append("标准编号不存在,");
}else{
String id = listStandardNumberData.get(0).getStandardId();
LawsMarketStandardDetail obj = op.get();
String id = obj.getStandardId();
p.setStandardId(id);
if(!CollectionUtils.isEmpty(listStandardIds) && listStandardIds.contains(id)){
s.append("标准编号已存在,");
@@ -281,25 +279,20 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
s.append("标准编号重复,");
}else{
// 验证标准名称
long l = listIdsStandard.stream().filter(o->Objects.equals(o.getStandardNumber(),p.getStandardNumber())
&& Objects.equals(o.getStandardName(),p.getStandardName())).count();
if(l == 0){
if(!Objects.equals(obj.getStandardName(),p.getStandardName())){
s.append("标准名称错误,");
}
// 验证标准英文名称
long l1 = listIdsStandard.stream().filter(o->Objects.equals(o.getStandardNumber(),p.getStandardNumber())
&& Objects.equals(o.getStandardEnglishName(),p.getStandardEnglishName())).count();
if(l1 == 0){
if(!StringUtils.isEmpty(obj.getStandardEnglishName())
&& !Objects.equals(obj.getStandardEnglishName(), p.getStandardEnglishName())){
s.append("标准英文名称错误,");
}
// 验证类型
long l2 = listIdsStandard.stream().filter(o->Objects.equals(o.getStandardNumber(),p.getStandardNumber())
&& Objects.equals(o.getType(),p.getType())).count();
if(l2 == 0){
if(!Objects.equals(obj.getType(),p.getType())){
s.append("类型错误,");
}
}
listStandardIdRepeat.add(listStandardNumberData.get(0).getId());
listStandardIdRepeat.add(id);
}
}
}