From d118f6263571016d94c30e8990f547adcd4b31b4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 11 Jul 2022 11:06:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/UserAnnouncementList.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index a4115c765..73824c59d 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -125,6 +125,12 @@ ellipsis: true, scopedSlots: { customRender: 'msgTitile' } }, + { + title: this.$t('Sponsor'), + align: 'center', + dataIndex: 'initiator', + width: 200, + }, { title: this.$t('MessageType'), align: 'center', @@ -132,12 +138,6 @@ width: 200, scopedSlots: { customRender: 'msgCategory' } }, - { - title: this.$t('Sponsor'), - align: 'center', - dataIndex: 'initiator', - width: 200, - }, { title: this.$t('NotificationTime'), align: 'center', From 5d2023038a106efec671b06318650254b2a49538 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 11 Jul 2022 11:09:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E5=8D=95--=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E5=8E=BB=E6=8E=89=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRelatedPersonnelServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index a22bc0d69..9c60e01fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -263,7 +263,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getId())) .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); } - lawName.append(lawEngineerName).append(" , "); + lawName.append(lawEngineerName).append(","); } projectRelatedPersonnel.setLawEngineerName(lawName.substring(0,lawName.toString().length()-3)); } @@ -289,7 +289,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getId())) .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); } - engineeringName.append(engineeringInterfacePersonName).append(" , "); + engineeringName.append(engineeringInterfacePersonName).append(","); } projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.substring(0,engineeringName.toString().length()-3)); } @@ -314,7 +314,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getId())) .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); } - certificationName.append(certificationEngineerName).append(" , "); + certificationName.append(certificationEngineerName).append(","); } projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-3)); } From 061ef75f2a68a956b7248db65494dc1fa6e809ed Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 11 Jul 2022 11:21:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E6=81=AF--=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/蔚来标准sql/first_bug_fix_record.sql | 4 ++ .../constant/enums/MessageTypeEnum.java | 1 + .../system/entity/SysAnnouncement.java | 4 ++ .../mapper/xml/SysAnnouncementMapper.xml | 1 + .../mapper/xml/SysAnnouncementSendMapper.xml | 4 +- .../system/model/AnnouncementSendModel.java | 4 ++ .../BussDocumentLibraryEOServiceImpl.java | 40 +++++++++++++------ .../impl/DummyInventoryBaseEOServiceImpl.java | 4 +- .../modules/warn/service/LawsWarnService.java | 2 +- .../modules/warn/service/TimedTaskWarn.java | 2 +- 10 files changed, 48 insertions(+), 18 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index e762a0d48..5af5e2560 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -45,3 +45,7 @@ ALTER TABLE `laws_weilai`.`sys_announcement` INSERT INTO `sys_config` ( `id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name` ) VALUES ( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'domianPreviewURL' ); + +-- 消息表添加发起人字段 +ALTER TABLE `sys_announcement` +ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`; diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java index e9fa81854..b6a2c2aa7 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java @@ -21,6 +21,7 @@ public enum MessageTypeEnum { DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知 PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知 VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知 + SYSTEMATIC_NOTIFICATION("Systematic Notification", "15"), // 系统通知 ; String name; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java index 779be4cd2..4da6a9046 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java @@ -153,4 +153,8 @@ public class SysAnnouncement implements Serializable { * 文档id */ private java.lang.String documentId; + /** + * 发起人 + */ + private java.lang.String initiator; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml index 1efdc73a6..1589ef460 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml @@ -27,6 +27,7 @@ + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index 790aa0b61..eeaf3e484 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -17,6 +17,7 @@ +