计划修改

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

@@ -13,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ActivityConfigurationUseMapper extends BaseMapper<ActivityConfigurationUse> {
 
     Integer queryByUse(ActivityConfigurationUseAddBo bo);
+
+    Integer countConfig(Long id);
 }

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

@@ -58,4 +58,6 @@ public interface IActivityConfigurationUseService extends IService<ActivityConfi
 	 * @return boolean
 	 */
 	boolean receive(ActivityConfigurationUseAddBo bo);
+
+    Integer countConfig(Long id);
 }

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

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
 import com.zhongzheng.modules.activity.mapper.ActivityConfigurationCourseMapper;
 import com.zhongzheng.modules.activity.mapper.ActivityConfigurationMapper;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
+import com.zhongzheng.modules.activity.service.IActivityConfigurationUseService;
 import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.vo.CourseConfigurationVo;
@@ -39,6 +40,9 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     @Autowired
     private ActivityConfigurationCourseMapper activityConfigurationCourseMapper;
 
+    @Autowired
+    private IActivityConfigurationUseService activityConfigurationUseService;
+
     @Override
     public ActivityConfigurationVo queryById(Long id){
         return this.baseMapper.selectConfigures(id);
@@ -47,7 +51,12 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
 
     @Override
     public List<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo) {
-        return entity2Vo(baseMapper.selectConfiguraList(bo));
+        List<ActivityConfigurationVo> activityConfigurationVos = entity2Vo(baseMapper.selectConfiguraList(bo));
+        for (ActivityConfigurationVo activityConfigurationVo : activityConfigurationVos) {
+            Integer num  = activityConfigurationUseService.countConfig(activityConfigurationVo.getId());
+            activityConfigurationVo.setUserNumber(num);
+        }
+        return activityConfigurationVos;
     }
 
     /**

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

@@ -142,6 +142,12 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
         return this.insertByAddBo(bo);
     }
 
+    @Override
+    public Integer countConfig(Long id) {
+        Integer num = baseMapper.countConfig(id);
+        return num;
+    }
+
     public Long afterSixMonthDate(Date currentDate,Integer amount){
         Calendar c = Calendar.getInstance();
         c.setTime(currentDate);

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

@@ -57,6 +57,12 @@ public class ActivityConfigurationVo {
 	@Excel(name = "发放数量")
 	@ApiModelProperty("发放数量")
 	private Integer quantity;
+
+
+	@Excel(name = "参与人数")
+	@ApiModelProperty("参与人数")
+	private Integer userNumber;
+
 	/** 直播内容（适用直播） */
 	@Excel(name = "直播内容" , readConverterExp = "适=用直播")
 	@ApiModelProperty("直播内容（适用直播）")

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

@@ -110,10 +110,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and c.description = #{description,jdbcType=VARCHAR}
         </if>
         <if test="startTime != null" >
-            and c.start_time = #{startTime,jdbcType=INTEGER}
+            and c.start_time &gt;= #{startTime,jdbcType=INTEGER}
         </if>
         <if test="endTime != null" >
-            and c.end_time = #{endTime,jdbcType=INTEGER}
+            and c.end_time &lt;= #{endTime,jdbcType=INTEGER}
         </if>
         <if test="price != null" >
             and c.price = #{price,jdbcType=DECIMAL}
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <choose>
             <when test="status !=null and status != ''">
-                and c.status = #{status,jdbcType=TINYINT}
+                and c.status = #{status}
             </when>
             <otherwise>
                 and c.status != 0

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

@@ -14,6 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryByUse" parameterType="com.zhongzheng.modules.activity.bo.ActivityConfigurationUseAddBo" resultType="int">
         select COUNT(user_id) FROM activity_configuration_use where 1=1
+        and user_id=#{userId}
+    </select>
 
+    <select id="countConfig" parameterType="map" resultType="int">
+        select COUNT(user_id) FROM activity_configuration_use where 1=1
+        and configuration_id = #{id}
     </select>
 </mapper>