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 plans = this.list(Wrappers.lambdaQuery(MaintenancePlan.class).eq(MaintenancePlan::getIsOpen, 1)); List ids = plans.stream().map(MaintenancePlan::getId).collect(Collectors.toList()); @@ -132,11 +131,11 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl