From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/task/service/impl/VisitingTaskHandler.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/VisitingTaskHandler.java b/src/main/java/org/springblade/modules/task/service/impl/VisitingTaskHandler.java
index ce6820b..925b23d 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/VisitingTaskHandler.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/VisitingTaskHandler.java
@@ -1,11 +1,11 @@
package org.springblade.modules.task.service.impl;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.modules.customTask.entity.CustomTaskEntity;
+import org.springblade.modules.threeColorTask.entity.CustomTaskEntity;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
import org.springblade.modules.grid.service.IGridWorkLogService;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.service.IUserHouseLabelService;
+import org.springblade.modules.house.vo.UserHouseLabelVO;
import org.springblade.modules.task.service.TaskHandle;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -28,18 +28,23 @@
public void taskHandle(CustomTaskEntity customTask) {
System.out.println("走访任务");
// 查询有标签的颜色的人
- List<UserHouseLabelEntity> list = userHouseLabelService.list(Wrappers.<UserHouseLabelEntity>lambdaQuery()
- .eq(UserHouseLabelEntity::getLableType, 1)
- .eq(UserHouseLabelEntity::getLabelId, customTask.getLabelId())
- .eq(UserHouseLabelEntity::getColor, customTask.getLabelColor())
- .isNotNull(UserHouseLabelEntity::getHouseholdId));
+ // List<UserHouseLabelEntity> list = userHouseLabelService.list(Wrappers.<UserHouseLabelEntity>lambdaQuery()
+ // .eq(UserHouseLabelEntity::getLableType, 1)
+ // .eq(UserHouseLabelEntity::getLabelId, customTask.getLabelId())
+ // .eq(UserHouseLabelEntity::getColor, customTask.getLabelColor())
+ // .isNotNull(UserHouseLabelEntity::getHouseholdId));
+ UserHouseLabelVO userHouseLabelVO = new UserHouseLabelVO();
+ userHouseLabelVO.setLabelId(customTask.getLabelId().longValue());
+ userHouseLabelVO.setColor(customTask.getLabelColor());
+ userHouseLabelVO.setTaskRange(customTask.getTaskRange());
+ List<UserHouseLabelEntity> list = userHouseLabelService.getUserHouseLabelList(userHouseLabelVO);
List<GridWorkLogEntity> gridWorkLogEntities = new ArrayList<>();
list.forEach(userHouseLabelEntity -> {
// 创建任务
GridWorkLogEntity gridWorkLogEntity = new GridWorkLogEntity();
- gridWorkLogEntity.setType(1);
+ gridWorkLogEntity.setType(2);
gridWorkLogEntity.setHouseholdId(userHouseLabelEntity.getHouseholdId());
- gridWorkLogEntity.setPersonType(1);
+ gridWorkLogEntity.setPersonType(customTask.getLabelId());
gridWorkLogEntity.setSource(2);
gridWorkLogEntity.setStatus(1);
gridWorkLogEntities.add(gridWorkLogEntity);
--
Gitblit v1.9.3