From 7e59a05c4a6fb089f832e748e6d35b57640568ac Mon Sep 17 00:00:00 2001
From: huangjin <huangjin@lucahealthcare.com>
Date: Wed, 4 Sep 2024 14:34:21 +0800
Subject: [PATCH] =?UTF-8?q?update=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/luca/pilot/entity/PlanModule.java | 2 +-
src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/luca/pilot/entity/PlanModule.java b/src/main/java/com/luca/pilot/entity/PlanModule.java
index 405a747..0a939a0 100644
--- a/src/main/java/com/luca/pilot/entity/PlanModule.java
+++ b/src/main/java/com/luca/pilot/entity/PlanModule.java
@@ -4,7 +4,7 @@ import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document;
@Data
-@Document(collection="plan_module_hj")
+@Document(collection="plan_module")
public class PlanModule {
private String key;
diff --git a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java
index c5b349b..b7c9bd6 100644
--- a/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/luca/pilot/service/impl/PlanServiceImpl.java
@@ -294,6 +294,7 @@ public class PlanServiceImpl implements PlanService {
.set("projectCode", planMoudle.getProjectCode())
.set("projectName", planMoudle.getProjectName())
.set("siteName", planMoudle.getSiteName())
+ .set("siteId", planMoudle.getSiteId())
.set("planId", planMoudle.getPlanId())
.set("planCode", planMoudle.getPlanCode())
.set("planDuration", planMoudle.getPlanDuration())
@@ -313,7 +314,7 @@ public class PlanServiceImpl implements PlanService {
.set("taskEndDate", planMoudle.getTaskEndDate())
.set("taskCompleteStatus", planMoudle.getTaskCompleteStatus())
.set("taskCompleteTime", planMoudle.getTaskCompleteTime())
- .set("taskEnabled", planMoudle.getTaskEndDate())
+ .set("taskEnabled", planMoudle.getTaskEnabled())
.set("taskCompleteOrder", planMoudle.getTaskCompleteOrder())
.set("moduleType", planMoudle.getModuleType())
.set("moduleId", planMoudle.getModuleId())
--
GitLab