WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档库--发布时间判空

Browse Source
This commit is contained in:
zhn
2022-06-17 18:27:20 +08:00
parent 3d7533dd4c
commit 66b658f2c6
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+12 -10
View File
@@ -608,10 +608,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if ("issue_time".equals(onlCgformField.getDbFieldName())) { if ("issue_time".equals(onlCgformField.getDbFieldName())) {
map.put("sort", "true");//列表排序标识 map.put("sort", "true");//列表排序标识
} }
// if ("issue_time".equals(onlCgformField.getDbFieldName())
// || "implement_time".equals(onlCgformField.getDbFieldName())) {
// map.put("sort", "true");//列表排序标识
// }
map.put("db_field_name", onlCgformField.getDbFieldName());//字段 map.put("db_field_name", onlCgformField.getDbFieldName());//字段
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1592,16 +1588,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String issueTime = (String) (map.get("issue_time")); String issueTime = (String) (map.get("issue_time"));
Date issueTimeDate = df.parse(issueTime); Date issueTimeDate = null;
if(StringUtils.isNotBlank(issueTime)){
issueTimeDate = df.parse(issueTime);
}
String implementTime = (String) map.get("implement_time");//在产车实施日期 String implementTime = (String) map.get("implement_time");//在产车实施日期
String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期 String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
if (StringUtils.isNotBlank(implementTime)) { if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date implementTimeDate = df.parse(implementTime); Date implementTimeDate = df.parse(implementTime);
if (issueTimeDate.after(implementTimeDate)) { if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于在产车实施日期"); throw new JeroBootException("发布日期不能大于在产车实施日期");
} }
} }
if (StringUtils.isNotBlank(newCarimplementTime)) { if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date newCarimplementTimeDate = df.parse(newCarimplementTime); Date newCarimplementTimeDate = df.parse(newCarimplementTime);
if (issueTimeDate.after(newCarimplementTimeDate)) { if (issueTimeDate.after(newCarimplementTimeDate)) {
throw new JeroBootException("发布日期不能大于新车型实施日期"); throw new JeroBootException("发布日期不能大于新车型实施日期");
@@ -2201,16 +2200,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
try { try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String issueTime = (String) map.get("issue_time"); String issueTime = (String) map.get("issue_time");
Date issueTimeDate = df.parse(issueTime); Date issueTimeDate = null;
if(StringUtils.isNotBlank(issueTime)){
issueTimeDate = df.parse(issueTime);
}
String implementTime = (String) map.get("implement_time");//在产车实施日期 String implementTime = (String) map.get("implement_time");//在产车实施日期
String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期 String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
if (StringUtils.isNotBlank(implementTime)) { if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date implementTimeDate = df.parse(implementTime); Date implementTimeDate = df.parse(implementTime);
if (issueTimeDate.after(implementTimeDate)) { if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于在产车实施日期"); throw new JeroBootException("发布日期不能大于在产车实施日期");
} }
} }
if (StringUtils.isNotBlank(newCarimplementTime)) { if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
Date newCarimplementTimeDate = df.parse(newCarimplementTime); Date newCarimplementTimeDate = df.parse(newCarimplementTime);
if (issueTimeDate.after(newCarimplementTimeDate)) { if (issueTimeDate.after(newCarimplementTimeDate)) {
throw new JeroBootException("发布日期不能大于新车型实施日期"); throw new JeroBootException("发布日期不能大于新车型实施日期");