From 2e6c7d962749a1e2be7321cf2195f2ad264502cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 25 Sep 2024 18:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B3=E9=94=AE=E9=9B=B6?=
 =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsPartRelevanceServiceImpl.java    | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java
index b819c90b..0d244746 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java
@@ -58,6 +58,24 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
                                               Integer pageSize, HttpServletRequest req) {
         QueryWrapper<LawsPartRelevance> queryWrapper =
                 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);
         IPage<LawsPartRelevance> re = page(page, queryWrapper);
         List<LawsPartRelevance> list = re.getRecords();
@@ -220,6 +238,26 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl<LawsPartRelevanceM
                 if(!StringUtils.isEmpty(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(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();
                     if(l > 0){
                         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();
                     if(l > 0){
                         s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ?
-                                "名称与功能系统码 duplicate," : "名称与功能系统码重复,"));
+                                "关键零部件名称与功能系统码 duplicate," : "关键零部件名称与功能系统码重复,"));
                     }
                 }
                 setAlready.add(code);