From 440f3671c552a58d9a911dbe184b583e3d17be16 Mon Sep 17 00:00:00 2001 From: renkang <8417338+k94314517@user.noreply.gitee.com> Date: 星期六, 30 十一月 2024 16:13:48 +0800 Subject: [PATCH] 客户资料 巡检任务业务 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java index ec9f16f..8ec0422 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java @@ -81,7 +81,20 @@ @Override public YwPatrolTask findById(Integer id) { - return ywPatrolTaskMapper.selectById(id); + YwPatrolTask ywPatrolTask = ywPatrolTaskMapper.selectJoinOne(YwPatrolTask.class,new MPJLambdaWrapper<YwPatrolTask>() + .selectAll(YwPatrolTask.class) + .selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode) + .selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle) + .selectAs(SystemUser::getRealname,YwPatrolTask::getUserName) + .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.ISDELETED = 0 ) ",YwPatrolTask::getPatrolNum) + .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.STATUS = 1 and t.ISDELETED = 0) ",YwPatrolTask::getPatrolNum) + .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTask::getDealUserId) + .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId) + .eq(YwPatrolTask::getIsdeleted, Constants.ZERO) + .eq(YwPatrolTask::getId,id) + .last(" limit 1 ")) + ; + return ywPatrolTask; } @Override @@ -123,14 +136,14 @@ .selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode) .selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle) .selectAs(SystemUser::getRealname,YwPatrolTask::getUserName) + .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.ISDELETED = 0 ) ",YwPatrolTask::getPatrolNum) + .select(" ( select count(1) from yw_patrol_task_record ytr where ytr.TASK_ID = t.id and t.STATUS = 1 and t.ISDELETED = 0) ",YwPatrolTask::getPatrolNum) .leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTask::getDealUserId) .leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId) .eq(YwPatrolTask::getIsdeleted, Constants.ZERO) .like(StringUtils.isNotBlank(model.getPlanTitle()),YwPatrolScheme::getTitle,model.getPlanTitle()) - .ge(Objects.nonNull(model.getStartDate()), YwPatrolTask::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate())) .le(Objects.nonNull(model.getEndDate()),YwPatrolTask::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate())) - .orderByDesc(YwPatrolTask::getId) ; IPage<YwPatrolTask> iPage = ywPatrolTaskMapper.selectJoinPage(page,YwPatrolTask.class,queryWrapper); -- Gitblit v1.9.3