From 999ef3d5c4eb29d6f0d6cefbe2abb47055189dee Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 29 Nov 2023 11:36:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=80=81=E6=B3=95=E8=A7=84=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=A6=81=E6=AD=A2=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsEnterpriseStandardServiceImpl.java    | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
index 4bb88fc8..291fa7c7 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
@@ -261,9 +261,22 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
                 gb.setYearNumber(parts[2]);
 
                 gb.setStandardName(dto.getBzmc());
+
                 gb.setStandardEnglishName(dto.getBzywmc());
-                gb.setReleaseDate(dto.getFbrq());
+                // 发布日期和实施日期入库之前需要校验 为空或者不符合规则的不入库
+                Date fbrq = dto.getFbrq();
+                Date ssrq = dto.getSsrq();
+                if (fbrq == null) {
+                    throw new JeroBootException("标准号为:" + dto.getBzh() + " 数据的发布日期为空");
+                } else {
+                    // 校验是否符合规则 不符合规则不入库
+                    gb.setReleaseDate(dto.getFbrq());
+                }
+                if (ssrq == null) {
+                    log.info("标准号为:" + dto.getBzh() + " 数据的实施日期为空");
+                }
                 gb.setImplementationDate(dto.getSsrq());
+
                 String standardState = dto.getBzzt();
                 gb.setStandardState(standardState.equals("现行有效") ? "6" : "7");
                 // 代替被代替特殊逻辑
@@ -394,11 +407,24 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
                 es.setStandardNumber(dto.getBzh());
                 es.setStandardName(dto.getBzmc());
                 es.setStandardEnglishName(dto.getBzywmc());
-                es.setReleaseDate(dto.getFbrq());
+
+                // 发布日期和实施日期入库之前需要校验 为空或者不符合规则的不入库
+                Date fbrq = dto.getFbrq();
+                Date ssrq = dto.getSsrq();
+                if (fbrq == null) {
+                    throw new JeroBootException("标准号为:" + dto.getBzh() + " 数据的发布日期为空");
+                } else {
+                    // 校验是否符合规则 不符合规则不入库
+                    es.setReleaseDate(dto.getFbrq());
+                }
+                if (ssrq == null) {
+                    log.info("标准号为:" + dto.getBzh() + " 数据的实施日期为空");
+                }
                 es.setImplementationDate(dto.getSsrq());
+
                 String standardState = dto.getBzzt();
                 es.setStandardState(standardState.equals("现行有效") ? "8" : "9");
-                es.setGradeClassification("1");
+                es.setGradeClassification(null);
                 // 代替被代替特殊逻辑
                 es.setSubstituteStandardNumber(dto.getTdbzh());
                 es.setReplacedByStandardNumber(dto.getBtdbzh());