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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-03-24 22:32:49 +08:00
parent 079892cf9b f6eede9bd7
commit e4b315af07
1 changed files with 35 additions and 13 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
+35 -13
View File
@@ -359,10 +359,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
map.put("click", "true"); map.put("click", "true");
} }
//单独处理发布日期和标准实施日期 //单独处理发布日期和标准实施日期
if ("issue_time".equals(onlCgformField.getDbFieldName()) if ("issue_time".equals(onlCgformField.getDbFieldName())) {
|| "implement_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());//字段中文名
@@ -950,15 +953,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
public void addInfo(Map<String, Object> map) { public void addInfo(Map<String, Object> map) {
try { try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String implementTime = (String) map.get("implement_time");
String issueTime = (String) map.get("issue_time"); String issueTime = (String) map.get("issue_time");
Date implementTimeDate = df.parse(implementTime);
Date issueTimeDate = df.parse(issueTime); Date issueTimeDate = df.parse(issueTime);
if (issueTimeDate.after(implementTimeDate)) { String implementTime = (String) map.get("implement_time");//在产车实施日期
throw new JeroBootException("发布日期不能大于标准实施日期"); String newCarimplementTime = (String) map.get("xin1_che1_xing2_ren4_zheng4_shi2_jian1");//新车型实施日期
if(StringUtils.isNotBlank(implementTime)){
Date implementTimeDate = df.parse(implementTime);
if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于在产车实施日期");
}
} }
} catch (ParseException e) { if(StringUtils.isNotBlank(newCarimplementTime)){
throw new JeroBootException("新增失败"); Date newCarimplementTimeDate = df.parse(newCarimplementTime);
if (issueTimeDate.after(newCarimplementTimeDate)) {
throw new JeroBootException("发布日期不能大于新车型实施日期");
}
}
} catch (Exception e) {
throw new JeroBootException(e.getMessage());
} }
if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) { if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
map.put("replace_standard", map.get("replace_standard_id")); map.put("replace_standard", map.get("replace_standard_id"));
@@ -1324,15 +1336,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
public void updateInfo(Map<String, Object> map) { public void updateInfo(Map<String, Object> map) {
try { try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String implementTime = (String) map.get("implement_time");
String issueTime = (String) map.get("issue_time"); String issueTime = (String) map.get("issue_time");
Date implementTimeDate = df.parse(implementTime);
Date issueTimeDate = df.parse(issueTime); Date issueTimeDate = df.parse(issueTime);
if (issueTimeDate.after(implementTimeDate)) { String implementTime = (String) map.get("implement_time");//在产车实施日期
throw new JeroBootException("发布日期不能大于标准实施日期"); String newCarimplementTime = (String) map.get("xin1_che1_xing2_ren4_zheng4_shi2_jian1");//新车型实施日期
if(StringUtils.isNotBlank(implementTime)){
Date implementTimeDate = df.parse(implementTime);
if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于在产车实施日期");
}
} }
if(StringUtils.isNotBlank(newCarimplementTime)){
Date newCarimplementTimeDate = df.parse(newCarimplementTime);
if (issueTimeDate.after(newCarimplementTimeDate)) {
throw new JeroBootException("发布日期不能大于新车型实施日期");
}
}
} catch (ParseException e) { } catch (ParseException e) {
throw new JeroBootException("编辑失败"); throw new JeroBootException(e.getMessage());
} }
String cut = (String) map.get("cut"); String cut = (String) map.get("cut");
if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) { if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {