From 14003fdb5bccb580012b99a97513fe556d8fb86d Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Tue, 8 Oct 2024 19:31:46 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=B3=95=E8=A7=84=E9=87=8A=E7=96=91?=
 =?UTF-8?q?=E5=BA=93=E6=8F=90=E4=BA=A4=E5=89=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsRegulationsQuestionLibrary.java       |  3 ++
 ...RegulationsQuestionLibraryServiceImpl.java | 29 ++++++++++++-------
 .../laws/businessSupport/vo/RegulationVo.java |  3 ++
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/entity/LawsRegulationsQuestionLibrary.java b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/entity/LawsRegulationsQuestionLibrary.java
index 60560b03..ac1eb129 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/entity/LawsRegulationsQuestionLibrary.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/entity/LawsRegulationsQuestionLibrary.java
@@ -46,6 +46,9 @@ public class LawsRegulationsQuestionLibrary implements Serializable {
     @ApiModelProperty(value = "标准id")
     private String standardId;
 
+    @ApiModelProperty(value = "条款id")
+    private String regulationId;
+
     @ApiModelProperty(value = "条款号")
     private String regulationNumber;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java
index 0ca7304a..9af5cc6d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/service/impl/LawsRegulationsQuestionLibraryServiceImpl.java
@@ -16,6 +16,8 @@ import com.jero.modules.laws.businessSupport.service.ILawsRegulationsQuestionLib
 import com.jero.modules.laws.businessSupport.vo.RegulationVo;
 import com.jero.modules.laws.businessSupport.vo.StandardVo;
 import com.jero.modules.laws.common.constant.FieldCommon;
+import com.jero.modules.laws.documenttool.entity.LawsSplitByStandardNumber;
+import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import org.apache.commons.lang3.StringUtils;
@@ -44,6 +46,8 @@ public class LawsRegulationsQuestionLibraryServiceImpl extends ServiceImpl<LawsR
     private StandardInterpretFlowService standardInterpretFlowService;
     @Resource
     private ISarFileSplitInfoService sarFileSplitInfoService;
+    @Resource
+    private IDocumentSplitService documentSplitService;
 
     @Override
     public IPage<LawsRegulationsQuestionLibrary> queryPage(LawsRegulationsQuestionLibrary lawsRegulationsQuestionLibrary, Integer pageNo, Integer pageSize) {
@@ -76,18 +80,23 @@ public class LawsRegulationsQuestionLibraryServiceImpl extends ServiceImpl<LawsR
     @Override
     public Result<?> check(LawsRegulationsQuestionLibrary lawsRegulationsQuestionLibrary) {
         // 校验标准编号和条款号是否存在,并给出提示信息
-        String standardNumber = lawsRegulationsQuestionLibrary.getStandardNumber();
-        String regulationNumber = lawsRegulationsQuestionLibrary.getRegulationNumber();
-        if (StringUtils.isNotBlank(standardNumber)) {
-            // 标准编号
-            List<String> standardNumberList = Arrays.asList(standardNumber.split(","));
+        List<RegulationVo> regulationList = lawsRegulationsQuestionLibrary.getRegulationList();
+        List<LawsSplitByStandardNumber> lawsSplitByStandardNumbers = new ArrayList<>();
+        for (RegulationVo regulationVo : regulationList) {
+            LawsSplitByStandardNumber lawsSplitByStandardNumber = new LawsSplitByStandardNumber();
+            lawsSplitByStandardNumber.setId(regulationVo.getId());
+            lawsSplitByStandardNumber.setStandardId(regulationVo.getStandardId());
+            lawsSplitByStandardNumber.setName(regulationVo.getStandardNumber() + " " + regulationVo.getItemNum());
+            lawsSplitByStandardNumbers.add(lawsSplitByStandardNumber);
         }
-        if (StringUtils.isNotBlank(regulationNumber)) {
-            // 条款号
-            List<String> regulationNumberList = Arrays.asList(regulationNumber.split(","));
-        }
-        // TODO 调用校验标准号和条款号的接口拿到结果的信息, 如:xxx条款不存在
+        String res = documentSplitService.checkStandardSplitInfo(lawsSplitByStandardNumbers);
         StringBuilder msg = new StringBuilder();
+        if (StringUtils.isNotBlank(res)) {
+            List<String> resList = Arrays.asList(res.split(","));
+            for (String s : resList) {
+                msg.append(s).append("不存在").append("</br>");
+            }
+        }
         if (StringUtils.isNotEmpty(msg.toString())) {
             Result<String> result = new Result<>();
             result.setMessage(msg.toString());
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/vo/RegulationVo.java b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/vo/RegulationVo.java
index f6d5fb91..e2149cc1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/vo/RegulationVo.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/businessSupport/vo/RegulationVo.java
@@ -9,6 +9,9 @@ public class RegulationVo {
     @ApiModelProperty(value = "标准id")
     private String standardId;
 
+    @ApiModelProperty(value = "条款id")
+    private String id;
+
     @ApiModelProperty(value = "标准编号")
     private String standardNumber;