From 22b111c8e0b331a32933fa32c31e8e4e834a760b Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Sun, 24 Nov 2024 18:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/contraller/MaintenanceController.java | 6 ++++--
 .../business/pojo/entity/maintenance/MaintenancePlan.java  | 5 +++++
 .../business/service/impl/MaintenancePlanServiceImpl.java  | 7 +++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
index 76db7bf..dbbf0e4 100644
--- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
@@ -22,6 +22,8 @@ import org.springblade.modules.business.service.IMaintenancePlanService;
 import org.springblade.modules.system.pojo.entity.User;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
+
 /**
  * 维保控制器
  *
@@ -89,9 +91,9 @@ public class MaintenanceController extends BladeController {
 	@PostMapping("/task-create")
 	@Operation(summary = "定时任务-根据维保计划生成维保任务", description = "定时任务-根据维保计划生成维保任务")
 	public R taskCreate() {
+		LocalDate now = LocalDate.now();
 		// 注意要查询上一次巡检计划中发现但未维修的
-		User user = UserCache.getUser(AuthUtil.getUserId());
-		return R.success("");
+		return R.status(maintenancePlanService.createTask(now));
 	}
 
 	@GetMapping("/task-detail")
diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java
index e07f30e..2e47e8e 100644
--- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java
+++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePlan.java
@@ -33,6 +33,11 @@ public class MaintenancePlan extends BaseEntity {
 	 */
 	private Long deptId;
 
+	/**
+	 * 单位名称
+	 */
+	private String deptName;
+
 	/**
 	 * 项目名称
 	 */
diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
index 2a0f302..28f4017 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
@@ -108,7 +108,6 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
 
     @Override
     public boolean createTask(LocalDate date) {
-        LocalDate.now();
         // 获取所有已开启的巡检计划
         List<MaintenancePlan> plans = this.list(Wrappers.lambdaQuery(MaintenancePlan.class).eq(MaintenancePlan::getIsOpen, 1));
         List<Long> ids = plans.stream().map(MaintenancePlan::getId).collect(Collectors.toList());
@@ -132,11 +131,11 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
                         Integer period = detail.getPeriod();
                         // 计算下次开始时间
                         if (period == 1) {
-                            localDate.minusMonths(-1);
+                            localDate = localDate.minusMonths(-1);
                         } else if (period == 2) {
-                            localDate.minusMonths(-3);
+                            localDate = localDate.minusMonths(-3);
                         } else if (period == 3) {
-                            localDate.minusMonths(-6);
+                            localDate = localDate.minusMonths(-6);
                         }
                         Date nextDate = Date.from(localDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
                         detail.setNextStartTime(nextDate);