计划修改

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityConfigurationController.java

@@ -52,8 +52,8 @@ public class ActivityConfigurationController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<ActivityConfigurationVo> list(ActivityConfigurationQueryBo bo) {
         startPage();
-        List<ActivityConfigurationVo> list = iActivityConfigurationService.queryList(bo);
-        return getDataTable(list);
+        TableDataInfo<ActivityConfigurationVo> list = iActivityConfigurationService.queryList(bo);
+        return list;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationAddBo.java

@@ -70,6 +70,18 @@ public class ActivityConfigurationAddBo {
     @ApiModelProperty("有效期几个月")
     private Integer couponEnd;
 
+    /** 活动图标 */
+    @Excel(name = "活动图标")
+    @ApiModelProperty("活动图标")
+    private String activityLogo;
+
+
+
+    /** 活动地址 */
+    @Excel(name = "活动地址")
+    @ApiModelProperty("活动地址")
+    private String activityUrl;
+
     /** 绑定课程 */
     @Excel(name = "绑定课程")
     @ApiModelProperty("绑定课程")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationEditBo.java

@@ -78,4 +78,16 @@ public class ActivityConfigurationEditBo {
     @ApiModelProperty("有效期几个月")
     private Integer couponEnd;
 
+    /** 活动图标 */
+    @Excel(name = "活动图标")
+    @ApiModelProperty("活动图标")
+    private String activityLogo;
+
+
+
+    /** 活动地址 */
+    @Excel(name = "活动地址")
+    @ApiModelProperty("活动地址")
+    private String activityUrl;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationQueryBo.java

@@ -85,4 +85,16 @@ public class ActivityConfigurationQueryBo extends BaseEntity {
 	@ApiModelProperty("有效期几个月")
 	private Integer couponEnd;
 
+	/** 活动图标 */
+	@Excel(name = "活动图标")
+	@ApiModelProperty("活动图标")
+	private String activityLogo;
+
+
+
+	/** 活动地址 */
+	@Excel(name = "活动地址")
+	@ApiModelProperty("活动地址")
+	private String activityUrl;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfiguration.java

@@ -71,4 +71,12 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     private Integer couponEnd;
 
+    /** 活动图标 */
+    private String activityLogo;
+
+
+
+    /** 活动地址 */
+    private String activityUrl;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -62,4 +62,6 @@ public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfigur
      * @return int
      */
     int selectCountActivity(@Param("goodsId") Long goodsId, @Param("activityId") Long activity);
+
+    long selectConfiguraCount(ActivityConfigurationQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.activity.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
@@ -29,7 +30,7 @@ public interface IActivityConfigurationService extends IService<ActivityConfigur
 	/**
 	 * 查询列表
 	 */
-	List<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo);
+	TableDataInfo<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入活动配置

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -3,6 +3,8 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpStatus;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
@@ -50,13 +52,19 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     }
 
     @Override
-    public List<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo) {
-        List<ActivityConfigurationVo> activityConfigurationVos = entity2Vo(baseMapper.selectConfiguraList(bo));
+    public TableDataInfo<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo) {
+        Collection<ActivityConfigurationVo> activityConfigurationVos = baseMapper.selectConfiguraList(bo);
         for (ActivityConfigurationVo activityConfigurationVo : activityConfigurationVos) {
             Integer num  = activityConfigurationUseService.countConfig(activityConfigurationVo.getId());
             activityConfigurationVo.setUserNumber(num);
         }
-        return activityConfigurationVos;
+
+        TableDataInfo<ActivityConfigurationVo> list = new TableDataInfo<>();
+        list.setRows(entity2Vo(activityConfigurationVos));
+        list.setCode(HttpStatus.HTTP_OK);
+        list.setMsg("查询成功");
+        list.setTotal(baseMapper.selectConfiguraCount(bo));
+        return list;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -92,6 +92,19 @@ public class ActivityConfigurationVo {
 	private Integer couponEnd;
 
 
+	/** 修改时间 */
+	@Excel(name = "有效期几个月")
+	@ApiModelProperty("有效期几个月")
+	private String activityLogo;
+
+
+
+	/** 修改时间 */
+	@Excel(name = "有效期几个月")
+	@ApiModelProperty("有效期几个月")
+	private String activityUrl;
+
+
 	/** 绑定课程 */
 	@Excel(name = "绑定课程")
 	@ApiModelProperty("绑定课程")

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -17,6 +17,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveAdress" column="live_adress"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="activityLogo" column="activity_logo"/>
+        <result property="activityUrl" column="activity_url"/>
         <result property="status" column="status"/>
     </resultMap>
 
@@ -34,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="activityLogo" column="activity_logo"/>
+        <result property="activityUrl" column="activity_url"/>
         <collection property="courses" javaType="java.util.List" resultMap="CourseResult"/>
     </resultMap>
 
@@ -101,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and c.id = #{id,jdbcType=INTEGER}
         </if>
         <if test="activityName != null" >
-            and c.activity_name = #{activityName,jdbcType=VARCHAR}
+            and c.activity_name like CONCAT(CONCAT('%', #{activityName,jdbcType=VARCHAR}), '%');
         </if>
         <if test="activityType != null" >
             and c.activity_type = #{activityType,jdbcType=VARCHAR}
@@ -266,4 +270,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND t.course_id =#{goodsId}
         </if>
     </select>
+
+
+    <select id="selectConfiguraCount" parameterType="com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo" resultType="long">
+        SELECT
+        count(c.id)
+        FROM
+        activity_configuration c
+        WHERE 1=1
+        <if test="id != null" >
+            and c.id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="activityName != null" >
+            and c.activity_name like CONCAT(CONCAT('%', #{activityName,jdbcType=VARCHAR}), '%');
+        </if>
+        <if test="activityType != null" >
+            and c.activity_type = #{activityType,jdbcType=VARCHAR}
+        </if>
+        <if test="description != null" >
+            and c.description = #{description,jdbcType=VARCHAR}
+        </if>
+        <if test="startTime != null" >
+            and c.start_time &gt;= #{startTime,jdbcType=INTEGER}
+        </if>
+        <if test="endTime != null" >
+            and c.end_time &lt;= #{endTime,jdbcType=INTEGER}
+        </if>
+        <if test="price != null" >
+            and c.price = #{price,jdbcType=DECIMAL}
+        </if>
+        <if test="quantity != null" >
+            and c.quantity = #{quantity,jdbcType=INTEGER}
+        </if>
+        <if test="liveContent != null" >
+            and c.live_content = #{liveContent,jdbcType=VARCHAR}
+        </if>
+        <if test="liveAdress != null" >
+            and c.live_adress = #{liveAdress,jdbcType=VARCHAR}
+        </if>
+        <if test="createTime != null" >
+            and c.create_time = #{createTime,jdbcType=INTEGER}
+        </if>
+        <if test="updateTime != null" >
+            and c.update_time = #{updateTime,jdbcType=INTEGER}
+        </if>
+        <choose>
+            <when test="status !=null and status != ''">
+                and c.status = #{status}
+            </when>
+            <otherwise>
+                and c.status != 0
+            </otherwise>
+        </choose>
+        order by c.update_time desc
+    </select>
 </mapper>