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 c9bbbfc..be9a62b 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 @@ -6,6 +6,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.query.BusiNoticeQuery; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 通告Controller - * + * * @author 朱春云 * @date 2025-03-17 */ @@ -44,12 +45,12 @@ public class BusiNoticeController extends BaseController */ @PreAuthorize("@ss.hasPermi('busi:notice:list')") @GetMapping("/list") - public AjaxResult list(BusiNotice busiNotice, - @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) + public AjaxResult list(BusiNoticeQuery query, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); - IPage list = busiNoticeService.queryListPage(busiNotice,page); + IPage list = busiNoticeService.queryListPage(query,page); return success(list); } @@ -84,7 +85,8 @@ public class BusiNoticeController extends BaseController @PostMapping public AjaxResult add(@RequestBody BusiNotice busiNotice) { - return toAjax(busiNoticeService.save(busiNotice)); + busiNoticeService.saveVo(busiNotice); + return success(); } /** @@ -109,4 +111,7 @@ public class BusiNoticeController extends BaseController List list = new ArrayList<>(Arrays.asList(ids)); return toAjax(busiNoticeService.removeByIds(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 5ba686f..caa33c5 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 @@ -12,9 +12,9 @@ import com.ruoyi.common.core.domain.DlBaseEntity; /** * 通告对象 dl_busi_notice - * + * * @author 朱春云 - * @date 2025-03-17 + * @date 2025-03-18 */ @TableName("dl_busi_notice") @Data @@ -40,15 +40,14 @@ public class BusiNotice extends DlBaseEntity private String title; /** 平台 */ + @Excel(name = "平台") private String platformCode; - /** 平台名称 */ - @Excel(name = "平台名称") - private String platformName; - /** 国家 */ - @Excel(name = "国家") - private String country; + /** 省份 */ + private String province; + /** 城市 */ + private String city; /** 稿费下限 */ @Excel(name = "稿费下限") @@ -99,12 +98,12 @@ public class BusiNotice extends DlBaseEntity @Excel(name = "报名是否需符合粉丝要求(0否|1是)") private Integer isEligible; - /** 图文/视频/不限 */ - @Excel(name = "图文/视频/不限") + /** 内容形式 */ + @Excel(name = "内容形式") private String pic; - /** 单品/合集/不限 */ - @Excel(name = "单品/合集/不限") + /** 展示形式 */ + @Excel(name = "展示形式") private String collect; /** 通告明细 */ 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 eac253c..f4c8d3f 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 @@ -4,18 +4,19 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.busi.domain.BusiNotice; +import com.ruoyi.query.BusiNoticeQuery; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** * 通告Mapper接口 - * + * * @author 朱春云 * @date 2025-03-17 */ @Mapper public interface BusiNoticeMapper extends BaseMapper { - IPage queryListPage(@Param("entity") BusiNotice entity, Page page); + IPage queryListPage(@Param("entity") BusiNoticeQuery query, Page page); } 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 55ddf2e..da974e0 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 @@ -5,14 +5,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.busi.domain.BusiNotice; +import com.ruoyi.query.BusiNoticeQuery; /** * 通告Service接口 - * + * * @author 朱春云 * @date 2025-03-17 */ public interface IBusiNoticeService extends IService { - IPage queryListPage(BusiNotice pageReqVO, Page page); + IPage queryListPage(BusiNoticeQuery query, Page page); + void saveVo(BusiNotice data); } 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 4531f16..13c7b1d 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 @@ -4,6 +4,8 @@ import java.util.List; import com.ruoyi.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.query.BusiNoticeQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -13,7 +15,7 @@ import com.ruoyi.busi.service.IBusiNoticeService; /** * 通告Service业务层处理 - * + * * @author 朱春云 * @date 2025-03-17 */ @@ -24,7 +26,14 @@ public class BusiNoticeServiceImpl extends ServiceImpl queryListPage(BusiNotice pageReqVO, Page page) { - return busiNoticeMapper.queryListPage(pageReqVO, page); + public IPage queryListPage(BusiNoticeQuery query, Page page) { + return busiNoticeMapper.queryListPage(query, page); + } + + @Override + public void saveVo(BusiNotice data) { + //获取当前登录用户 + data.setUserId(SecurityUtils.getUserId()); + this.save(data); } } 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 new file mode 100644 index 0000000..3528217 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java @@ -0,0 +1,13 @@ +package com.ruoyi.busi.vo; + +import com.ruoyi.busi.domain.BusiNotice; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +@Data +public class BusiNoticeVo extends BusiNotice { + /**发布者名称**/ + private String userNickName; + /** 平台名称 */ + private String platformName; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/query/BusiNoticeQuery.java b/ruoyi-admin/src/main/java/com/ruoyi/query/BusiNoticeQuery.java new file mode 100644 index 0000000..d6ea620 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/query/BusiNoticeQuery.java @@ -0,0 +1,37 @@ +package com.ruoyi.query; + +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class BusiNoticeQuery { + /**发布者名称**/ + private String userNickName; + /** 标题 */ + private String title; + /** 平台 */ + private String platformCode; + /** 省份 */ + private String province; + /** 城市 */ + private String city; + /** 品牌 */ + private String brand; + /** 内容形式 */ + private String pic; + /** 展示形式 */ + private String collect; + /** 是否使用通告券(0 否|1是) */ + private Integer isUseCoupon; + /** 审核状态 */ + private String approvalStatus; + private String bloggerTypes; + /** 查询条件 */ + private JSONObject params =new JSONObject(); +} diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index 92c019c..24d55e9 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -1,72 +1,49 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, user_id, title, platform_code, platform_name, country, fee_down, fee_up, is_self_price, gift_detail, gift_price, end_date, brand, is_show_brand, need_num, fans_down, fans_up, is_eligible, pic, collect, detail, images, blogger_types, is_show_tel, wechat, tel, group_image, is_use_coupon, approval_status, approval_user_id, approval_time, approval_remark, creator, create_time, updater, update_time, del_flag from dl_busi_notice - - + select main.id, main.user_id, main.title, main.platform_code, main.province, main.city, main.fee_down, main.fee_up, main.is_self_price, main.gift_detail, + main.gift_price, main.end_date, main.brand, main.is_show_brand, main.need_num, main.fans_down, main.fans_up, main.is_eligible, main.pic, main.collect, main.detail, main.images, + main.blogger_types, main.is_show_tel, main.wechat, main.tel, main.group_image, main.is_use_coupon, main.approval_status, main.approval_user_id, main.approval_time, + main.approval_remark, main.creator, main.create_time, main.updater, main.update_time, main.del_flag, + uTable.nick_name as userNickName, + bTable.title as platformName + from dl_busi_notice main + left join sys_user uTable on main.user_id = uTable.user_id + left join dl_base_category bTable on main.platform_code = bTable.code - and user_id like concat('%', #{entity.userId}, '%') - and title like concat('%', #{entity.title}, '%') - and platform_name like concat('%', #{entity.platformName}, '%') - and country = #{entity.country} - and fee_down = #{entity.feeDown} - and fee_up = #{entity.feeUp} - and is_self_price = #{entity.isSelfPrice} - and brand = #{entity.brand} - and is_show_brand = #{entity.isShowBrand} - and need_num = #{entity.needNum} - and fans_down = #{entity.fansDown} - and fans_up = #{entity.fansUp} - and is_eligible = #{entity.isEligible} - and pic = #{entity.pic} - and collect = #{entity.collect} - and detail = #{entity.detail} + main.del_flag = '0' + and uTable.nick_name like concat('%', #{entity.userNickName}, '%') + and main.province = #{entity.province} + and main.city = #{entity.city} + and main.title like concat('%', #{entity.title}, '%') + and main.platform_code = #{entity.platformCode} + + + and main.fee_down = ]]> #{entity.params.beginFeeDown} + + + and main.fee_down #{entity.params.endFeeDown} + + + + and main.fans_down = ]]> #{entity.params.beginFansDown} + + + and main.fans_down #{entity.params.endFansDown} + + and main.brand like concat('%', #{entity.brand}, '%') + and main.pic = #{entity.pic} + and main.collect = #{entity.collect} + and main.blogger_types = #{entity.bloggerTypes} + and main.is_use_coupon = #{entity.isUseCoupon} + and main.approval_status = #{entity.approvalStatus} + and main.create_time between #{entity.params.beginCreateTime} and #{entity.params.endCreateTime} - \ No newline at end of file + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java index 111bb46..259b629 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/DlBaseEntity.java @@ -1,5 +1,6 @@ package com.ruoyi.common.core.domain; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -12,7 +13,7 @@ import java.util.Date; /** * Entity基类--点亮 - * + * * @author ruoyi */ @Data @@ -43,4 +44,8 @@ public class DlBaseEntity implements Serializable @TableLogic private String delFlag; + /** 查询条件 */ + @TableField(exist = false) + private JSONObject params =new JSONObject(); + }