fix 广告类型

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

@@ -56,4 +56,7 @@ public class ActivityAdvertisingAddBo {
     @ApiModelProperty("广告名称")
     @NotNull(message = "广告名称 不能为空")
     private String advName;
+    /** 广告类型 1学习中心 2求职 */
+    @ApiModelProperty("广告类型 1学习中心 2求职")
+    private Integer type;
 }

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

@@ -58,4 +58,9 @@ public class ActivityAdvertisingEditBo {
     /** 广告名称 */
     @ApiModelProperty("广告名称")
     private String advName;
+
+    /** 广告类型 1学习中心 2求职 */
+    @ApiModelProperty("广告类型 1学习中心 2求职")
+    private Integer type;
+
 }

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

@@ -70,5 +70,8 @@ public class ActivityAdvertisingQueryBo extends BaseEntity {
 	/** 有效期过期时间 */
 	@ApiModelProperty("发布时间结束")
 	private Long endIssueTime;
+	/** 广告类型 1学习中心 2求职 */
+	@ApiModelProperty("广告类型 1学习中心 2求职")
+	private Integer type;
 
 }

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

@@ -13,7 +13,7 @@ import java.io.Serializable;
 
 /**
  * 广告发布储存对象 activity_advertising
- * 
+ *
  * @author change
  * @date 2021-05-17
  */
@@ -62,9 +62,10 @@ private static final long serialVersionUID=1L;
     /** 0删除 1待发布 2 撤回 3发布成功 */
     private Integer status;
 
-
-
     /** 广告名称 */
     private String advName;
 
+    /** 广告类型 1学习中心 2求职 */
+    private Integer type;
+
 }

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

@@ -56,6 +56,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         lqw.apply(bo.getStarIssueTime() != null,"start_time BETWEEN {0} and {1}",bo.getStarIssueTime(),bo.getEndIssueTime());
         lqw.orderByDesc(ActivityAdvertising::getUpdateTime);
         List<ActivityAdvertising> list = this.list(lqw);
+        lqw.eq(bo.getType() != null, ActivityAdvertising::getType, bo.getType());
         return entity2Vo(list);
     }
 

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

@@ -64,4 +64,8 @@ public class ActivityAdvertisingVo {
 	@Excel(name = "创建时间")
 	@ApiModelProperty("创建时间")
 	private Long createTime;
+	/** 1学习中心 2求职 */
+	@Excel(name = "1学习中心 2求职")
+	@ApiModelProperty("广告类型 1学习中心 2求职")
+	private Integer type;
 }

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

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reStatus" column="re_status"/>
         <result property="status" column="status"/>
         <result property="advName" column="adv_name"/>
+        <result property="type" column="type"/>
     </resultMap>
     <resultMap type="com.zhongzheng.modules.activity.vo.ActivityAdvertisingVo" id="ActivityAdvertisingResultVo">
         <result property="id" column="id"/>
@@ -29,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reStatus" column="re_status"/>
         <result property="status" column="status"/>
         <result property="advName" column="adv_name"/>
+        <result property="type" column="type"/>
     </resultMap>
 
 
@@ -38,4 +40,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND #{startTime} BETWEEN start_time AND end_time
         </if>
     </select>
-</mapper>
+</mapper>