feat: 会议举办次数限制-加日志

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmTaskMapper.java

@@ -175,10 +175,11 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
 	 * 查询会议任务个数
 	 *
 	 * @param taskTypeList 任务类型列表
+	 * @param taskUserId 用户id
 	 * @param startTime 会议时间范围-开始
 	 * @param endTime 会议时间范围-结束
 	 * @return 会议任务个数
 	 */
-	Long countMeetingTask(@Param("taskTypeList") List<String> taskTypeList, @Param("startTime") LocalDateTime startTime,
-						  @Param("endTime") LocalDateTime endTime);
+	Long countMeetingTask(@Param("taskTypeList") List<String> taskTypeList, @Param("taskUserId") String taskUserId,
+						  @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmTaskService.java

@@ -193,9 +193,10 @@ public interface WmTaskService extends IService<WmTask> {
 	 * 查询会议任务个数
 	 *
 	 * @param taskTypeList 任务类型列表
+	 * @param taskUserId 用户id
 	 * @param startTime 会议时间范围-开始
 	 * @param endTime 会议时间范围-结束
 	 * @return 会议任务个数
 	 */
-	Long countMeetingTask(List<String> taskTypeList, LocalDateTime startTime, LocalDateTime endTime);
+	Long countMeetingTask(List<String> taskTypeList, String taskUserId, LocalDateTime startTime, LocalDateTime endTime);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -134,7 +134,8 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					LocalDate.parse(wmTaskContent.getTemp4(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
 			LocalDateTime start = LocalDateTime.of(currentLookintoDate,LocalTime.MIN);
 			LocalDateTime end = LocalDateTime.of(currentLookintoDate,LocalTime.MAX);
-			long meetingTaskCount = wmTaskService.countMeetingTask(CollectionUtil.toList("1", "2", "3", "4"), start, end);
+			long meetingTaskCount = wmTaskService.countMeetingTask(CollectionUtil.toList("1", "2", "3", "4"),
+							String.valueOf(sysU.getUserId()), start, end);
 			log.info("会议举办次数：{}", meetingTaskCount);
 			if (meetingTaskCount >= 2L) {
 				return R.failed(1, "每天最多举办两场会议");
@@ -159,7 +160,8 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					LocalDate.parse(wmTaskContent.getTemp4(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
 			LocalDateTime start = LocalDateTime.of(currentLookintoDate,LocalTime.MIN);
 			LocalDateTime end = LocalDateTime.of(currentLookintoDate,LocalTime.MAX);
-			long meetingTaskCount = wmTaskService.countMeetingTask(CollectionUtil.toList("19"), start, end);
+			long meetingTaskCount = wmTaskService.countMeetingTask(CollectionUtil.toList("19"),
+					String.valueOf(sysU.getUserId()), start, end);
 			log.info("一对一专访次数：{}", meetingTaskCount);
 			if (meetingTaskCount >= 2L) {
 				return R.failed(1, "每天最多举办两场一对一专访");

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -2322,12 +2322,13 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 	 * 查询会议任务个数
 	 *
 	 * @param taskTypeList 任务类型列表
+	 * @param taskUserId 用户id
 	 * @param startTime 会议时间范围-开始
 	 * @param endTime 会议时间范围-结束
 	 * @return 会议任务个数
 	 */
 	@Override
-	public Long countMeetingTask(List<String> taskTypeList, LocalDateTime startTime, LocalDateTime endTime) {
-		return wmTaskMapper.countMeetingTask(taskTypeList, startTime, endTime);
+	public Long countMeetingTask(List<String> taskTypeList, String taskUserId, LocalDateTime startTime, LocalDateTime endTime) {
+		return wmTaskMapper.countMeetingTask(taskTypeList, taskUserId, startTime, endTime);
 	}
 }

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -1235,6 +1235,7 @@ FROM
 		<foreach collection="taskTypeList" item="item" index="index" separator="," open="(" close=")">
 			#{item}
 		</foreach>
-		  AND wm_task_content.temp4 BETWEEN #{startTime} AND #{endTime}
+		AND wm_task.task_user_id = #{taskUserId}
+	  	AND wm_task_content.temp4 BETWEEN #{startTime} AND #{endTime}
 	</select>
 </mapper>