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/SelfExaminationTaskHandler.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/SelfExaminationTaskHandler.java b/src/main/java/org/springblade/modules/task/service/impl/SelfExaminationTaskHandler.java
index 1a7439c..457278f 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/SelfExaminationTaskHandler.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/SelfExaminationTaskHandler.java
@@ -1,10 +1,12 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
-import org.springblade.modules.customTask.entity.CustomTaskEntity;
+import org.springblade.modules.threeColorTask.entity.CustomTaskEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.task.entity.TaskEntity;
@@ -23,6 +25,7 @@
@Component("SelfExaminationTaskHandler")
public class SelfExaminationTaskHandler implements TaskHandle {
+ private static final Logger logger = LoggerFactory.getLogger(SelfExaminationTaskHandler.class);
@Autowired
private IPlaceService placeService;
@@ -35,12 +38,16 @@
Query query = new Query();
IPage<PlaceVO> page = Condition.getPage(query);
PlaceVO placeVO = new PlaceVO();
- placeVO.setPoiCodes(customTask.getPlaceLabel().toString());
+ placeVO.setPlaceLabel(customTask.getPlaceLabel());
+ placeVO.setPlaceSmallLabel(customTask.getPlaceSmallLabel());
placeVO.setNineType(customTask.getNineType());
+ placeVO.setColor(customTask.getLabelColor());
+ placeVO.setTaskRange(customTask.getTaskRange());
IPage<PlaceVO> placePage = placeService.getPlacePage(page, placeVO);
ITaskService iTaskService = SpringUtils.getBean(ITaskService.class);
// 计算总页数
long pages = placePage.getPages();
+ System.out.println("总页数：" + pages);
for (int i = 1; i <= pages; i++) {
page = Condition.getPage(query);
page.setCurrent(i);
@@ -48,7 +55,7 @@
placePage.getRecords().forEach(place -> {
TaskEntity taskEntity = new TaskEntity();
taskEntity.setType(1);
- taskEntity.setName("自查");
+ taskEntity.setName(customTask.getName());
taskEntity.setCreateTime(new Date());
taskEntity.setHouseCode(place.getHouseCode());
taskEntity.setReportType(7);
@@ -62,6 +69,7 @@
taskPlaceSelfCheck.setHouseCode(place.getHouseCode());
taskPlaceSelfCheck.setPlaceName(place.getPlaceName());
taskPlaceSelfCheck.setStatus(4);
+ taskPlaceSelfCheck.setType("1");
taskPlaceSelfCheckService.save(taskPlaceSelfCheck);
// taskPlaceSelfCheckList.add(taskPlaceSelfCheck);
});
--
Gitblit v1.9.3