diff --git a/src/main/java/com/luca/pilot/entity/PlanModule.java b/src/main/java/com/luca/pilot/entity/PlanModule.java index 405a747ab75d9026b2fe2b86272b3d824c0c5d60..0a939a00b40e53e41da5cb9503ae262fa4618a74 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 c5b349b272a90ac3e5afe9434500899e410c41cb..b7c9bd6470ea42c86cbace163bca2754026a9ed1 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())