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

fix:87326

Browse Source
This commit is contained in:
梁琦涛
2024-07-24 10:01:57 +08:00
parent df71ac4fac
commit 9f3782391f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+3 -4
View File
@@ -244,11 +244,9 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
s.append("标准编号不存在,"); s.append("标准编号不存在,");
continue; continue;
}else{ }else{
checkStandar(listStandardIds, listStandardIdRepeat, p, s, op); checkStandard(listStandardIds, listStandardIdRepeat, p, s, op);
} }
} }
checkDate(p, s);
if(!StringUtils.isBlank(s.toString())){ if(!StringUtils.isBlank(s.toString())){
m.append("第").append(i + 4).append("行，").append(s.toString(), 0, s.toString().length() - 1) m.append("第").append(i + 4).append("行，").append(s.toString(), 0, s.toString().length() - 1)
.append("<br>"); .append("<br>");
@@ -257,7 +255,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
return m; return m;
} }
private void checkStandar(List<String> listStandardIds, List<String> listStandardIdRepeat, LawsMarketStandardDetail p, StringBuilder s, Optional<LawsMarketStandardDetail> op) { private void checkStandard(List<String> listStandardIds, List<String> listStandardIdRepeat, LawsMarketStandardDetail p, StringBuilder s, Optional<LawsMarketStandardDetail> op) {
if(!op.isPresent()){ if(!op.isPresent()){
return; return;
} }
@@ -277,6 +275,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
if(!Objects.equals(obj.getStandardEnglishName(), p.getStandardEnglishName())){ if(!Objects.equals(obj.getStandardEnglishName(), p.getStandardEnglishName())){
s.append("标准英文名称错误,"); s.append("标准英文名称错误,");
} }
checkDate(p, s);
// 验证类型 // 验证类型
if(!Objects.equals(obj.getType(),p.getType())){ if(!Objects.equals(obj.getType(),p.getType())){
s.append("类型错误,"); s.append("类型错误,");