From 8192de0fb2d487240390903d70b1bb3f7f12718d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 9 Nov 2022 11:07:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysAnnouncementSendController.java | 5 +++-- .../system/mapper/xml/SysAnnouncementSendMapper.xml | 3 +++ .../system/service/ISysAnnouncementSendService.java | 2 +- .../service/impl/SysAnnouncementSendServiceImpl.java | 7 ++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index 5555c464b..7f042554b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -213,7 +213,8 @@ public class SysAnnouncementSendController { @GetMapping(value = "/getMyAnnouncementSend") public Result> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + String cut) { Result> result = new Result>(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); @@ -221,7 +222,7 @@ public class SysAnnouncementSendController { announcementSendModel.setPageNo((pageNo-1)*pageSize); announcementSendModel.setPageSize(pageSize); Page pageList = new Page(pageNo,pageSize); - pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel); + pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel,cut); result.setResult(pageList); result.setSuccess(true); return result; 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 c47d88995..25952a57c 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 @@ -72,6 +72,9 @@ and sa.msg_content LIKE concat(concat('%',#{announcementSendModel.msgContent}),'%') + + + and sa.msg_content_cn LIKE concat(concat('%',#{announcementSendModel.msgContentCn}),'%') order by sas.read_flag,sa.send_time desc diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java index d80d113d5..c58cc1973 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java @@ -23,7 +23,7 @@ public interface ISysAnnouncementSendService extends IService getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel); + public Page getMyAnnouncementSendPage(Page page,AnnouncementSendModel announcementSendModel,String cut); List getMessageUnreadList(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java index c9f62b243..d6e3fbc3b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import javax.annotation.Resource; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.system.entity.SysAnnouncementSend; import com.jero.modules.system.mapper.SysAnnouncementSendMapper; @@ -34,7 +35,11 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl getMyAnnouncementSendPage(Page page, - AnnouncementSendModel announcementSendModel) { + AnnouncementSendModel announcementSendModel,String cut) { + if(CutEnum.CN.getValue().equals(cut)){ + announcementSendModel.setMsgContentCn(announcementSendModel.getMsgContent()); + announcementSendModel.setMsgContent(null); + } return page.setRecords(sysAnnouncementSendMapper.getMyAnnouncementSendList(page, announcementSendModel)); } From 92618c37b825932a5a51797f33df3ffa80d729da Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 9 Nov 2022 13:50:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=B1=95=E7=A4=BA=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/HeaderNotice.vue | 4 ++-- jero-web/src/views/dashboard/components/myNews.vue | 4 ++-- .../src/views/regulatoryEarlyWarning/index.vue | 14 +++++++++++++- jero-web/src/views/system/UserAnnouncementList.vue | 6 +++--- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index 0233fec30..52298ebb1 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -15,9 +15,9 @@ diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue index fe22a2d10..a41bfc74b 100644 --- a/jero-web/src/views/dashboard/components/myNews.vue +++ b/jero-web/src/views/dashboard/components/myNews.vue @@ -11,8 +11,8 @@
-
- {{language == 'zh-cn'?item.msgContentCn:item.msgContent}} +
+ {{language == 'zh-cn' && item.msgContentCn?item.msgContentCn:item.msgContent}}
{{item.sendTime}} diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 1d39b7282..2e38e9c4e 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -38,6 +38,9 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + {{text}} + {{text}} @@ -164,7 +167,7 @@ dataIndex: 'title', ellipsis: true, width: 170, - scopedSlots: { customRender: 'titleName' } + scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('status'), @@ -244,6 +247,15 @@ eventBUs.$off('searchQuery') }, methods: { + standClick(val){ + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: val.id + } + }) + window.open(newUrl.href, '_blank') + }, callback(tab) { this.selectedRowKeys = [] this.activeTab = tab diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index eb6183d14..019721871 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -73,8 +73,8 @@ - {{language == 'zh-cn' ? scope.msgContentCn : scope.msgContent}} + :title="language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent"> + {{language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent}} @@ -84,7 +84,7 @@

- +

From 6eaba7770fe4b11e000991e312ee2e146dd0bc87 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 9 Nov 2022 17:28:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessSupport/problemKnowledgeBase/index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue index 61d4e96ee..7c008db5a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue @@ -4,7 +4,7 @@ - + @@ -13,6 +13,7 @@