diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java index f1c2e63..99a2832 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java @@ -288,4 +288,25 @@ public class BusiNoticeController extends BaseController IPage list = busiNoticeService.myNoticeList(query,page); return success(list); } + + /** + * 小程序端查询通告主发布的通告 + * @author zcy + * @date 15:39 2025/3/29 + * @param query 查询条件 + * @param pageNum 1 + * @param pageSize 10 + * @return com.ruoyi.common.core.domain.AjaxResult + **/ + @GetMapping("/myPublishNoticeList") + public AjaxResult myPublishNoticeList(AppNoticeQuery query, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) + { + Page page = new Page<>(pageNum, pageSize); + IPage list = busiNoticeService.myPublishNoticeList(query,page); + return success(list); + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java index faada6b..712ad35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNotice.java @@ -66,7 +66,7 @@ public class BusiNotice extends DlBaseEntity @Excel(name = "是否需自报价") private Integer isSelfPrice; //是否有赠品 0 1 - private String haveGift; + private Integer haveGift; /** 赠品明细 */ @Excel(name = "赠品明细") @@ -171,6 +171,9 @@ public class BusiNotice extends DlBaseEntity @TableField(exist = false) private List customForm; + @TableField(exist = false) + private Long cityId; + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java index 131bdfc..1b61570 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java @@ -77,6 +77,17 @@ public interface BusiNoticeMapper extends BaseMapper { **/ IPage myNoticeList(@Param("entity") AppNoticeQuery query, Page page); + /** + * 小程序端通告主的通告列表 + * @author zcy + * @date 15:39 2025/3/29 + * @param query 查询条件 + * @return com.ruoyi.common.core.domain.AjaxResult + **/ + IPage myPublishNoticeList(@Param("entity") AppNoticeQuery query, Page page); + + + /** * 小程序端查询通告详细信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java index 2a4ad13..80d6462 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/query/AppNoticeQuery.java @@ -34,4 +34,7 @@ public class AppNoticeQuery { //'全部', '审核中', '已通过', '未合作' private String reportStatus; + //'进行中', '已关闭' + private String status; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java index 6edf88f..3f29ed8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java @@ -96,6 +96,10 @@ public interface IBusiNoticeService extends IService IPage myNoticeList(AppNoticeQuery query, Page page); + IPage myPublishNoticeList(AppNoticeQuery query, Page page); + + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java index 77fc483..1a8b036 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.busi.service.impl; import java.util.*; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -191,10 +192,10 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryWrapper =new LambdaQueryWrapper<>(); - queryWrapper.eq(BaseCity::getCityId,data.getCity()); + queryWrapper.eq(BaseCity::getCityId,data.getCityId()); BaseCity city = cityService.getOne(queryWrapper); String cityName = city.getName(); queryWrapper =new LambdaQueryWrapper<>(); @@ -374,6 +375,19 @@ public class BusiNoticeServiceImpl extends ServiceImpl customForm = busiNoticeFormService.list(new LambdaQueryWrapper() .eq(BusiNoticeForm::getNoticeId,noticeId).orderByAsc(BusiNoticeForm::getSort)); detail.setCustomForm(customForm.stream().map(BusiNoticeForm::getLabelTitle).collect(Collectors.toList())); + //获取城市id + LambdaQueryWrapper queryWrapperCity = new LambdaQueryWrapper<>(); + queryWrapperCity.eq(BaseCity::getName,detail.getCity()); + List list = cityService.list(queryWrapperCity); + for (BaseCity baseCity : list) { + queryWrapperCity = new LambdaQueryWrapper<>(); + queryWrapperCity.eq(BaseCity::getCityId,baseCity.getParentId()); + BaseCity byId = cityService.getOne(queryWrapperCity); + if (byId.getName().equals(detail.getProvince())) { + detail.setCityId(baseCity.getCityId()); + } + } + res.put("noticeDetail",detail); //通告主信息 SysUser userDetail = userService.selectUserById(detail.getUserId()); @@ -549,5 +563,31 @@ public class BusiNoticeServiceImpl extends ServiceImpl myPublishNoticeList(AppNoticeQuery query, Page page) { + //获取当前登录用户 + Long userId = SecurityUtils.getUserId(); + query.setUserId(userId); + IPage pageList = baseMapper.myPublishNoticeList(query, page); + List idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); + if(!idList.isEmpty()){ + //查博主类型字典 + List categoryList = baseCategoryService.listByParentCode(DictConstants.BLOGGER_TYPES_KEY,null); + //转map + Map categoryMap = categoryList.stream().collect(Collectors.toMap(BaseCategory::getCode,BaseCategory::getTitle)); + pageList.getRecords().forEach(item->{ + //报名数量、浏览量、相关字典转换 + if(null==item.getViewNum()){ + item.setViewNum(0); + } + item.setBloggerTypesText(noticeUtils.translateBloggerTypes(item.getBloggerTypes(),categoryMap)); + if(StringUtils.isNotEmpty(item.getImages())){ + item.setMainImage(item.getImages().split(StrUtil.COMMA)[0]); + } + }); + } + return pageList; + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java index 2306b06..62fc315 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java @@ -35,6 +35,8 @@ public class BusiNoticeVo extends BusiNotice { //报名时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date signTime; + //状态 + private String reportStatusText; } diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index 2a4559f..7859a78 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -126,10 +126,7 @@ order by dbns.create_time desc +