diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java index 772273c..b761e1e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java @@ -125,6 +125,30 @@ public class SysAnnouncementController { return result; } + /** + * 专家分页列表查询 + * @param sysAnnouncement + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @RequestMapping(value = "/expertList", method = RequestMethod.GET) + public Result> queryExpertPageList(SysAnnouncement sysAnnouncement, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); + String userId = sysUser.getId(); + String title = req.getParameter("title"); + Page page = new Page(pageNo,pageSize); + IPage pageList = sysAnnouncementService.queryExpertPageList(page,userId,title,"1"); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + /** * 添加 * @param sysAnnouncement diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java index 4df93c7..57f6332 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementMapper.java @@ -55,4 +55,13 @@ public interface SysAnnouncementMapper extends BaseMapper { * @return */ List getNotSendedAnnouncementlist(@Param("currDate") Date currDate, @Param("userId")String userId); + + /** + * 通过消息类型和专家id获取通告 + * @param page + * @param userId 用户id + * @param msgCategory 消息类型 + * @return + */ + List queryExpertPageList(Page page, @Param("userId")String userId, @Param("title")String title,@Param("msgCategory")String msgCategory); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml index 3e29fd1..91a5b0e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml @@ -112,4 +112,18 @@ user_id = #{userId} ) + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java index 6124045..10b55f5 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementService.java @@ -91,4 +91,6 @@ public interface ISysAnnouncementService extends IService { * @return */ public List getNotSendedAnnouncementlist(String userId); + + Page queryExpertPageList(Page page, String userId, String title, String msgCategory); } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java index 4127474..f7e2746 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java @@ -235,4 +235,9 @@ public class SysAnnouncementServiceImpl extends ServiceImpl queryExpertPageList(Page page, String userId, String title, String msgCategory){ + return page.setRecords(sysAnnouncementMapper.queryExpertPageList(page, userId, title, msgCategory)); + } + } diff --git a/jeecgboot-vue3/src/views/bl/tzgg/DetailModal.vue b/jeecgboot-vue3/src/views/bl/tzgg/DetailModal.vue new file mode 100644 index 0000000..c1771ef --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/tzgg/DetailModal.vue @@ -0,0 +1,39 @@ + + + + diff --git a/jeecgboot-vue3/src/views/bl/tzgg/index.vue b/jeecgboot-vue3/src/views/bl/tzgg/index.vue new file mode 100644 index 0000000..ab17787 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/tzgg/index.vue @@ -0,0 +1,214 @@ + + + + diff --git a/jeecgboot-vue3/src/views/bl/tzgg/notice.data.ts b/jeecgboot-vue3/src/views/bl/tzgg/notice.data.ts new file mode 100644 index 0000000..28de187 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/tzgg/notice.data.ts @@ -0,0 +1,35 @@ +import { BasicColumn, FormSchema } from '/@/components/Table'; +import { rules } from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; + +export const formSchema: FormSchema[] = [ + { + field: 'id', + label: 'id', + component: 'Input', + show: false, + }, + { + field: 'titile', + label: '标题', + component: 'Input', + required: true, + componentProps: { + placeholder: '', + }, + }, + { + field: 'sendTime', + label: '发布时间', + component: 'Input', + required: true, + componentProps: { + placeholder: '', + }, + }, + { + field: 'msgContent', + label: '内容', + component: 'JEditor', + }, +]; diff --git a/jeecgboot-vue3/src/views/system/notice/index.vue b/jeecgboot-vue3/src/views/system/notice/index.vue index 7665f81..6b8e887 100644 --- a/jeecgboot-vue3/src/views/system/notice/index.vue +++ b/jeecgboot-vue3/src/views/system/notice/index.vue @@ -92,7 +92,6 @@ import {ExclamationCircleOutlined} from "@ant-design/icons-vue"; const glob = useGlobSetting(); const [detailModal, { openModal: openDetail }] = useModal(); const [noticeModal, { openModal }] = useModal(); -const iframeUrl = ref(''); const APagination = Pagination; onMounted(()=>{ @@ -149,8 +148,6 @@ function handleClear() { function handleDetail(record){ openDetail(true,{ record, - isUpdate: true, - showFooter: true, }); }