|
@@ -193,7 +193,7 @@ public class HealthPlanServiceImpl implements HealthPlanService {
|
|
|
return java.util.Collections.emptyList();
|
|
return java.util.Collections.emptyList();
|
|
|
}
|
|
}
|
|
|
QueryWrapper<Task> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<Task> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.eq("source_type", "plan")
|
|
|
|
|
|
|
+ wrapper.eq("source_type", "health_plan")
|
|
|
.eq("source_id", planId)
|
|
.eq("source_id", planId)
|
|
|
.orderByAsc("id");
|
|
.orderByAsc("id");
|
|
|
return taskMapper.selectList(wrapper);
|
|
return taskMapper.selectList(wrapper);
|
|
@@ -366,7 +366,7 @@ public class HealthPlanServiceImpl implements HealthPlanService {
|
|
|
|
|
|
|
|
boolean exists = taskMapper.selectCount(new QueryWrapper<Task>()
|
|
boolean exists = taskMapper.selectCount(new QueryWrapper<Task>()
|
|
|
.eq("family_id", familyId)
|
|
.eq("family_id", familyId)
|
|
|
- .eq("source_type", "plan")
|
|
|
|
|
|
|
+ .eq("source_type", "health_plan")
|
|
|
.eq("source_id", plan.getId())
|
|
.eq("source_id", plan.getId())
|
|
|
.eq("title", draft.title)
|
|
.eq("title", draft.title)
|
|
|
.ge("deadline", todayStart.getTime())
|
|
.ge("deadline", todayStart.getTime())
|
|
@@ -375,7 +375,7 @@ public class HealthPlanServiceImpl implements HealthPlanService {
|
|
|
if ("购买任务".equals(draft.categoryLabel) && buyTaskId == null) {
|
|
if ("购买任务".equals(draft.categoryLabel) && buyTaskId == null) {
|
|
|
Task existingBuy = taskMapper.selectOne(new QueryWrapper<Task>()
|
|
Task existingBuy = taskMapper.selectOne(new QueryWrapper<Task>()
|
|
|
.eq("family_id", familyId)
|
|
.eq("family_id", familyId)
|
|
|
- .eq("source_type", "plan")
|
|
|
|
|
|
|
+ .eq("source_type", "health_plan")
|
|
|
.eq("source_id", plan.getId())
|
|
.eq("source_id", plan.getId())
|
|
|
.eq("title", draft.title)
|
|
.eq("title", draft.title)
|
|
|
.eq("category", "购买任务")
|
|
.eq("category", "购买任务")
|
|
@@ -401,7 +401,7 @@ public class HealthPlanServiceImpl implements HealthPlanService {
|
|
|
task.setPoints(10);
|
|
task.setPoints(10);
|
|
|
task.setDeadline(deadline);
|
|
task.setDeadline(deadline);
|
|
|
task.setStatus("pending");
|
|
task.setStatus("pending");
|
|
|
- task.setSourceType("plan");
|
|
|
|
|
|
|
+ task.setSourceType("health_plan");
|
|
|
task.setSourceId(plan.getId());
|
|
task.setSourceId(plan.getId());
|
|
|
task.setNeedReview(1);
|
|
task.setNeedReview(1);
|
|
|
task.setCreatedAt(now);
|
|
task.setCreatedAt(now);
|