From d7a3e26494e0c0f54df9a0fac83f7b3b4487dcef Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 16 Feb 2023 11:55:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E5=8F=91=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9-?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/project/job/PrehomoJob.java | 16 ++++++++-------- .../modules/project/job/VerifyComplianceJob.java | 4 ++-- .../impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java index 732262bcd..04736c68e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java @@ -168,15 +168,15 @@ public class PrehomoJob implements Job { } } //如果prehomo - 结束日期是一周后的日期 - if(StringUtils.equals(oneWeekLaterDaysStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ - oneWeeksLaterUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); + if(StringUtils.equals(oneWeekLaterDaysStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ + oneWeeksLaterUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); } } //如果prehomo - 逾期后每天通知 - if (!StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))&&projectLawsInventoryEO.getDesignDueDate().before(currentDate)) { - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ - dueUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); + if (!StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))&&projectLawsInventoryEO.getPrehomoDueDate().before(currentDate)) { + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ + dueUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); } } } @@ -202,12 +202,12 @@ public class PrehomoJob implements Job { feishuMsgVo.setCnContentLower("项目: " + projectName + "\n法规: " + LAW_CN + "\n发起人: 系统通知"+ - "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); feishuMsgVo.setEnContentUpper("Hello! Your task is overdue. Please check and address it ASAP"); feishuMsgVo.setEnContentLower("Project: " + projectName + "\nRegulation No: " + LAW_EN + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()+ - "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setColor(MsgColorEnum.YELLOW.getValue()); // 颜色 feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 483c2f80f..5a79ae3bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -201,12 +201,12 @@ public class VerifyComplianceJob implements Job { feishuMsgVo.setCnContentLower("项目: " + projectName + "\n法规: " + LAW_CN + "\n发起人: 系统通知"+ - "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getVerifyDueDate())); feishuMsgVo.setEnContentUpper("Hello! Your task is overdue. Please check and address it ASAP"); feishuMsgVo.setEnContentLower("Project: " + projectName + "\nRegulation No: " + LAW_EN + "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()+ - "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate())); + "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getVerifyDueDate())); feishuMsgVo.setUrl(hrefFeishu); feishuMsgVo.setColor(MsgColorEnum.YELLOW.getValue()); // 颜色 feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 1b02e6e9c..4dfb665ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -3206,12 +3206,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Thu, 16 Feb 2023 14:58:37 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/assets/less/common.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index 0804540e0..6c2d75d98 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -113,14 +113,14 @@ right: 0; top: 0; height: 100%; - width: 1px; + width: 5px; z-index: 1; - border-left: 1px #e8e8e8 solid; + border-right: 1px #e8e8e8 solid; } .nio-drag-handler:hover, .nio-drag-handler:focus{ cursor: col-resize!important; - border: 1px solid #0bd9d9!important; + border-right: 2px solid #0bd9d9!important; } .ant-table-column-title { From e6d24856790f2578bb9e5f8bde6846162d180515 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 16 Feb 2023 15:30:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=8A=B6=E6=80=81=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsCollectManifestEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index a84996dc9..4f27f21e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1430,6 +1430,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Fri, 17 Feb 2023 16:07:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=20?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E6=8E=A7=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202.=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 6 +++++- jero-web/src/common/lang/zh-cn.js | 5 +++++ .../components/globalAdvancedQuery/index.vue | 20 +++++++++---------- .../views/regulatoryEarlyWarning/index.vue | 7 ++++++- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4c187d4d7..e2f58b10f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1378,5 +1378,9 @@ module.exports = { columnforced:'Confirm a forced retraction?', customize:'List setting', customColumn:'Custom column', - + afterdate:'In... After the date', + afterdatein:'In... After date (inclusive)', + beforedate:'In... Before date', + beforedatein:'In... Before date (inclusive)', + inRecentMonthsin6:'Within 6 months (implemented)', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5389c8ff0..ed71ce96b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1479,4 +1479,9 @@ module.exports = { contactTheFounder:'联系作者', customize:'列表设置', customColumn:'自定义列', + afterdate:'在...日期之后', + afterdatein:'在...日期之后（包含）', + beforedate:'在...日期之前', + beforedatein:'在...日期之前（包含）', + inRecentMonthsin6:'近6个月内（已实施）', } \ No newline at end of file diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index ac400b983..b8e71934d 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -96,7 +96,7 @@ - {{$t('beEqualTo')}} + {{$t('beEqualTo')}} {{$t('contain')}} @@ -106,15 +106,15 @@ {{$t('in')}} - {{$t('notEqual')}} - - {{$t('granter')}} - - {{$t('greaterOrEqual')}} - - {{$t('less')}} - - {{$t('lessOrEqual')}} + {{$t('notEqual')}} + + {{$t('afterdate')}} + + {{$t('afterdatein')}} + + {{$t('beforedate')}} + + {{$t('beforedatein')}} diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 2e55ad9f6..d4952cef3 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -143,6 +143,10 @@ value: '2', name: this.$t('inRecentMonths6') }, + { + value: '5', + name: this.$t('inRecentMonthsin6') + }, { value: '3', name: this.$t('inRecentYear1') @@ -150,7 +154,8 @@ { value: '4', name: this.$t('inRecentYear2') - } + }, + ] } ], From 98e9905be78326e78c5845a558ff943c01186ec9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 17 Feb 2023 17:00:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?uat=E6=B8=85=E5=8D=95-51-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93=E6=B8=85=E5=8D=95=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 4 ++++ .../impl/ParamsReportDetailEOServiceImpl.java | 21 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 7dca687dc..2c10b0303 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -197,3 +197,7 @@ MODIFY COLUMN `msg_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_c MODIFY COLUMN `msg_content_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息详情（英文）' AFTER `msg_content`, ADD COLUMN `msg_content_cn` text NULL COMMENT '消息内容（中文）' AFTER `msg_content_info`, ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容（中文）' AFTER `msg_content_cn`; + + +-- 上报库-参数项查看页表头 责任领域更新为展示列表sql 2023-02-17 未同步生产环境 +UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 1 WHERE `id` = 'c31d68e204960c073b1fb8126a443492'; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 131e98f6c..ef6bee45a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -594,10 +594,23 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl Date: Fri, 17 Feb 2023 17:15:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 2 +- jero-web/src/components/search/index.vue | 89 ++++++++++++++----- 2 files changed, 67 insertions(+), 24 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 8634f8b22..58ce204a7 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 @@ -2216,7 +2216,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 12) { - year2 = parseInt(year2) + yearData - month2 = parseInt(month2) % 12 - }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月 - var day2 = day - var days2 = new Date(year2, month2, 0) - days2 = days2.getDate() - if (day2 > days2) { - day2 = days2 - }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2 - if (month2 < 10) { - month2 = '0' + month2 + if(this.queryParam['WarnTimeText'] == '5'){ + var time = new Date(); + time.setTime(time.getTime()); + var s2 = time.getFullYear()+"-" + (time.getMonth()+1) + "-" + time.getDate(); + var monthNum=6; //要减的月数(6)自己定义 + var dateArr = s2.split('-'); //s2当前时间 + var year = dateArr[0]; //获取当前日期的年份 + var month = dateArr[1]; //获取当前日期的月份 + var day = dateArr[2]; //获取当前日期的日 + var days = new Date(year, month, 0); + days = days.getDate(); //获取当前日期中月的天数 + var year2; + if(month <6){ + year2 = year -1; + }else{ + year2 = year; + } + var month2 = parseInt(month) - monthNum; + if (month2 <=0) { + year2 = parseInt(year2) - parseInt(month2 / 12 == 0 ? 1 : parseInt(month2) / 12); + month2 = 12 - (Math.abs(month2) % 12); + } + var day2 = day; + var days2 = new Date(year2, month2, 0); + days2 = days2.getDate(); + if (day2 > days2) { + day2 = days2; + } + if (month2 < 10) { + month2 = '0' + month2; + } + var t2 = year2 + '-' + month2 + '-' + day2; + return t2 + }else{ + var date_now = new Date()//获取当前时间 + var year = date_now.getFullYear()//获取当前时间的年份 + var month = date_now.getMonth()//获取当前时间的月份 + var day = date_now.getDate()//获取当前时间的日 + var days = new Date(year, month, 0)//将获取到的年月赋值给days + days = days.getDate()//获取当前年月的日 + var year2 = year + var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份 + if (month2 > 12) { + year2 = parseInt(year2) + yearData + month2 = parseInt(month2) % 12 + }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月 + var day2 = day + var days2 = new Date(year2, month2, 0) + days2 = days2.getDate() + if (day2 > days2) { + day2 = days2 + }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2 + if (month2 < 10) { + month2 = '0' + month2 + } + var time = year2 + '-' + month2 + '-' + day2 + return time } - var time = year2 + '-' + month2 + '-' + day2 - return time + }, dateChange(item) { this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')