update:法规释疑库提交前校验

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;
 

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();
+        List<RegulationVo> regulationList = lawsRegulationsQuestionLibrary.getRegulationList();
-        String regulationNumber = lawsRegulationsQuestionLibrary.getRegulationNumber();
+        List<LawsSplitByStandardNumber> lawsSplitByStandardNumbers = new ArrayList<>();
-        if (StringUtils.isNotBlank(standardNumber)) {
+        for (RegulationVo regulationVo : regulationList) {
-            // 标准编号
+            LawsSplitByStandardNumber lawsSplitByStandardNumber = new LawsSplitByStandardNumber();
-            List<String> standardNumberList = Arrays.asList(standardNumber.split(","));
+            lawsSplitByStandardNumber.setId(regulationVo.getId());
+            lawsSplitByStandardNumber.setStandardId(regulationVo.getStandardId());
+            lawsSplitByStandardNumber.setName(regulationVo.getStandardNumber() + " " + regulationVo.getItemNum());
+            lawsSplitByStandardNumbers.add(lawsSplitByStandardNumber);
         }
-        if (StringUtils.isNotBlank(regulationNumber)) {
+        String res = documentSplitService.checkStandardSplitInfo(lawsSplitByStandardNumbers);
-            // 条款号
-            List<String> regulationNumberList = Arrays.asList(regulationNumber.split(","));
-        }
-        // TODO 调用校验标准号和条款号的接口拿到结果的信息, 如:xxx条款不存在
         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());

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;