From b253d5c794093e7872c41025812aed21fe1fb7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 30 May 2023 19:05:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=89=E5=B9=B4=E5=86=85=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 38 +++++++++---------- .../modules/warn/service/LawsWarnService.java | 4 +- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/search/index.vue | 5 ++- .../views/regulatoryEarlyWarning/index.vue | 8 +++- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index a01f25fa6..0cc56ba53 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4373,25 +4373,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= '" + warnTime.split(",")[0] + "'" - + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); - } - }else{ - //日期(区分单日期还时间范围) - if (warnTime.contains(",")) { - conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" - + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); - } - } - } +// if(StringUtils.isNotBlank(warnTime)){ +// if("0".equals(flag)){ +// //日期(区分单日期还时间范围) +// if (warnTime.contains(",")) { +// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" +// + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); +// } else { +// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); +// } +// }else{ +// //日期(区分单日期还时间范围) +// if (warnTime.contains(",")) { +// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" +// + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); +// } else { +// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); +// } +// } +// } //高级搜索 queryConditionVOList List if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 1fd7b4b88..1887f6bb7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -102,7 +102,7 @@ public class LawsWarnService { } else if(StringUtils.equals(flag,"1")){ parameter.put("implement_time",parameter.get("WarnTime")); } - parameter.remove("WarnTime"); +// parameter.remove("WarnTime"); String cut = (String) parameter.get("cut");//中英文切换标识 List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); @@ -122,6 +122,8 @@ public class LawsWarnService { fieldListNew.add(fieldTemp); } } + + //封装查询条件 String condition = bussDocumentLibraryEOService.getConditionStr(parameter); int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 28d744d1e..e65385334 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1333,6 +1333,7 @@ module.exports = { inRecentMonths6:'In recent 6 months', inRecentYear1:'In recent 1 year', inRecentYear2:'In recent 2 year', + inRecentYear3:'In recent 3 year', selectAll:'Select All', importLocalDisassemblyOrder:'Import local disassembly order', notExport:'Not exported', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f92664c4a..f4d27845b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1435,6 +1435,7 @@ module.exports = { inRecentMonths6: '近6个月内', inRecentYear1: '近1年内', inRecentYear2: '近2年内', + inRecentYear3: '近3年内', selectAll: '全选', importLocalDisassemblyOrder: '导入本地拆解单', notExport: '未导出', diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index af43a52be..465f35037 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -245,7 +245,7 @@ if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') // this.queryParam['WarnTimeText'] = '2' - let endTime = this.getNowdate() + let endTime = '2099-01-01' this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } @@ -295,6 +295,9 @@ }else if (this.queryParam['WarnTimeText'] == '5') { monthData = 7 yearData = -1 + }else if (this.queryParam['WarnTimeText'] == '6') { + monthData = 37 + yearData = 3 } if(this.queryParam['WarnTimeText'] == '5'){ var time = new Date(); diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index e1d2d7b2b..6554970ac 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -155,7 +155,10 @@ value: '4', name: this.$t('inRecentYear2') }, - + { + value: '6', + name: this.$t('inRecentYear3') + }, ] } ], @@ -338,6 +341,9 @@ } else if (this.searchParmes['WarnTimeText'] == '4') { monthData = 25 yearData = 2 + }else if (this.queryParam['WarnTimeText'] == '6') { + monthData = 37 + yearData = 3 } var date_now = new Date()//获取当前时间 var year = date_now.getFullYear()//获取当前时间的年份