feat: 老法规导入解除发布日期实施日期必填限制
This commit is contained in:
+3
-22
@@ -263,18 +263,9 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
|
|||||||
gb.setStandardName(dto.getBzmc());
|
gb.setStandardName(dto.getBzmc());
|
||||||
|
|
||||||
gb.setStandardEnglishName(dto.getBzywmc());
|
gb.setStandardEnglishName(dto.getBzywmc());
|
||||||
|
|
||||||
// 发布日期和实施日期入库之前需要校验 为空或者不符合规则的不入库
|
// 发布日期和实施日期入库之前需要校验 为空或者不符合规则的不入库
|
||||||
Date fbrq = dto.getFbrq();
|
gb.setReleaseDate(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());
|
gb.setImplementationDate(dto.getSsrq());
|
||||||
|
|
||||||
String standardState = dto.getBzzt();
|
String standardState = dto.getBzzt();
|
||||||
@@ -409,17 +400,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
|
|||||||
es.setStandardEnglishName(dto.getBzywmc());
|
es.setStandardEnglishName(dto.getBzywmc());
|
||||||
|
|
||||||
// 发布日期和实施日期入库之前需要校验 为空或者不符合规则的不入库
|
// 发布日期和实施日期入库之前需要校验 为空或者不符合规则的不入库
|
||||||
Date fbrq = dto.getFbrq();
|
es.setReleaseDate(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());
|
es.setImplementationDate(dto.getSsrq());
|
||||||
|
|
||||||
String standardState = dto.getBzzt();
|
String standardState = dto.getBzzt();
|
||||||
|
|||||||
Reference in New Issue
Block a user