From cd95151b58fe7ccfa727bafedf617f52cb3af35c Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Fri, 25 Apr 2025 09:58:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E5=91=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/controller/BusiNoticeController.java | 3 +- .../com/ruoyi/busi/domain/BusiNotice.java | 4 ++ .../com/ruoyi/busi/domain/BusiNoticeSign.java | 11 +++-- .../ruoyi/busi/mapper/BusiNoticeMapper.java | 2 +- .../com/ruoyi/busi/query/AppNoticeQuery.java | 6 +++ .../busi/service/IBusiNoticeService.java | 2 +- .../service/impl/BusiNoticeServiceImpl.java | 19 ++++++--- .../impl/BusiNoticeSignServiceImpl.java | 2 +- .../service/impl/MemberCouponServiceImpl.java | 4 +- .../mapper/busi/BusiNoticeMapper.xml | 41 +++++++++++-------- 10 files changed, 60 insertions(+), 34 deletions(-) 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 6a3c7bb..dc7b38e 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 @@ -228,8 +228,7 @@ public class BusiNoticeController extends BaseController @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - Page page = new Page<>(pageNum, pageSize); - IPage list = busiNoticeService.appFootprintList(query,page); + List list = busiNoticeService.appFootprintList(query); 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 f7ab68c..8748d00 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 @@ -52,6 +52,10 @@ public class BusiNotice extends DlBaseEntity private String province; /** 城市 */ private String city; + /** + * 是否急招0否1是 + */ + private String isUrgent; //是否平台结算 private Integer isPlatformFree; /** 稿费下限 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java index 32c7325..c2b9c0a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java @@ -43,11 +43,10 @@ public class BusiNoticeSign extends DlBaseEntity private String nickname; /** 报名用户头像 */ - @Excel(name = "报名用户头像") + @Excel(name = "报名用户头像", cellType = Excel.ColumnType.IMAGE) private String avatar; - /** 是否超级报名 */ - @Excel(name = "是否超级报名") + private String isSuper; /** 联系方式 */ @@ -59,18 +58,18 @@ public class BusiNoticeSign extends DlBaseEntity private String addrId; /** 通告合作状态 */ - @Excel(name = "通告合作状态") + private String status; /** 稿件内容 */ private String content; /** 稿件图片 */ - @Excel(name = "稿件图片") + private String images; /** 已发布的文章链接 */ - @Excel(name = "已发布的文章链接") + private String articleRef; /** * 动态表单json 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 1b61570..43ec3fb 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 @@ -49,7 +49,7 @@ public interface BusiNoticeMapper extends BaseMapper { * @param query 查询条件 * @return com.ruoyi.common.core.domain.AjaxResult **/ - IPage appFootprintList(@Param("entity") AppNoticeQuery query, Page page); + List appFootprintList(@Param("entity") AppNoticeQuery query, @Param("num") Integer num); /** * 小程序端查询订阅通告列表 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 2aa7fb4..f3fe8ac 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 @@ -37,5 +37,11 @@ public class AppNoticeQuery { //'进行中', '已关闭' private String status; private String noticeId; + //是否急招 + private String isUrgent; + //是否平台结算 + private String isPlatformFree; + + } 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 aabed79..dd72b0a 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 @@ -79,7 +79,7 @@ public interface IBusiNoticeService extends IService * @param query 查询条件 * @return com.ruoyi.common.core.domain.AjaxResult **/ - IPage appFootprintList(AppNoticeQuery query, Page page); + List appFootprintList(AppNoticeQuery query); /** 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 88ac6c4..c0d895e 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 @@ -36,6 +36,7 @@ import com.ruoyi.member.domain.MemberApply; import com.ruoyi.member.domain.MemberUser; import com.ruoyi.member.service.IMemberApplyService; import com.ruoyi.member.service.IMemberCardService; +import com.ruoyi.member.service.IMemberCouponService; import com.ruoyi.member.service.IMemberUserService; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; @@ -83,6 +84,8 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryListPage(BusiNoticeQuery query, Page page) { @@ -216,7 +219,12 @@ public class BusiNoticeServiceImpl extends ServiceImpl appFootprintList(AppNoticeQuery query, Page page) { + public List appFootprintList(AppNoticeQuery query) { query.setUserId(SecurityUtils.getUserId()); - IPage pageList = busiNoticeMapper.appFootprintList(query,page); - List idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); + Integer num = cardService.getCardRightsValue(SecurityUtils.getUserId(), "02", "history"); + List pageList = busiNoticeMapper.appFootprintList(query,num); + List idList = pageList.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->{ + pageList.forEach(item->{ //报名数量、浏览量、相关字典转换 if(null==item.getViewNum()){ item.setViewNum(0); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java index e6670ee..8b62690 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java @@ -65,7 +65,7 @@ public class BusiNoticeSignServiceImpl extends ServiceImpl and main.city = #{entity.city} and main.title like concat('%', #{entity.title}, '%') and main.platform_code = #{entity.platformCode} + and main.is_urgent = #{entity.isUrgent} + and main.is_platform_free = #{entity.isPlatformFree} and main.fee_down = ]]> #{entity.params.beginFeeDown} @@ -74,7 +76,7 @@ order by dbns.create_time desc LEFT JOIN sys_user su ON dbn.user_id = su.user_id left join dl_busi_notice_sign sign on sign.notice_id = dbn.id and sign.del_flag = 0 WHERE - dbn.del_flag = 0 + dbn.del_flag = 0 and dbn.end_date >= CURDATE() AND (dbn.approval_status = '1') AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != '' ) @@ -82,6 +84,8 @@ order by dbns.create_time desc AND ( dbn.platform_code =#{entity.platformCode} ) + and dbn.is_urgent = #{entity.isUrgent} + and dbn.is_platform_free = #{entity.isPlatformFree} AND ( dbn.blogger_types LIKE CONCAT('%',#{entity.bloggerType},'%') ) @@ -109,20 +113,20 @@ order by dbns.create_time desc group by dbn.id ORDER BY - - - -- 查最新的 -- - dbn.create_time DESC - - - -- 查高奖励 -- - dbn.fee_up DESC - - - -- 默认正序排列 -- - dbn.create_time DESC - - + + + -- 查最新的 -- + dbn.create_time DESC + + + -- 查高奖励 -- + dbn.fee_up DESC + + + -- 默认正序排列 -- + dbn.create_time DESC + +