From 03f428c266e4edcc772e8cffe7bcd7953303298a Mon Sep 17 00:00:00 2001 From: zhanglei Date: Mon, 3 Aug 2026 11:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../institution/EvalProjectExecutor.java | 33 +------------------ .../gatewayimpl/EvalProjectGatewayImpl.java | 28 +--------------- 2 files changed, 2 insertions(+), 59 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java index 468f28c..25b951a 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java @@ -115,41 +115,10 @@ public class EvalProjectExecutor implements EvalProjectApi { public PageResponse page(EvalProjectPageQuery query) { EvalProjectQuery domainQuery = evalProjectCmdConvertor.convertPageQueryToQ(query); domainQuery.setSurveyType(query.getSurveyType()); + domainQuery.setMyProject(query.getMyProject()); PageResult pageResult = evalProjectDomainService.page(domainQuery); List co = evalProjectCmdConvertor.convertEListToCOList(pageResult.getRecords()); if (!CollectionUtils.isEmpty(co)) { - if (query.getSurveyType() == 0) { - // 未完成,有可能其他人已经上传检查表(已完成),但是当前人员没有去打卡, 需要判断节点是否完成, 如完成,设置为完成 - for (EvalProjectCO evalProjectCO : co) { - int surveyType = 0; - List projectNodeCOS = JSON.parseArray(evalProjectCO.getProjectNode(), ProjectNodeCO.class); - for (ProjectNodeCO projectNodeCO : projectNodeCOS) { - if (ProjectStageEnum.SITE_SURVEY.getVal().equals(projectNodeCO.getType()) && projectNodeCO.getState() == 1) { - surveyType = 1; - break; - } - } - evalProjectCO.setSurveyType(surveyType); - } - } - if (query.getSurveyType() == 1) { - for (EvalProjectCO evalProjectCO : co) { - evalProjectCO.setSurveyType(1); - } - } - if (query.getSurveyType() == 2) { - for (EvalProjectCO evalProjectCO : co) { - int surveyType = 0; - List projectNodeCOS = JSON.parseArray(evalProjectCO.getProjectNode(), ProjectNodeCO.class); - for (ProjectNodeCO projectNodeCO : projectNodeCOS) { - if (ProjectStageEnum.SITE_SURVEY.getVal().equals(projectNodeCO.getType()) && projectNodeCO.getState() == 1) { - surveyType = 1; - break; - } - } - evalProjectCO.setSurveyType(surveyType); - } - } // 获取客户公司名称 Map customerNameMap = evalCustomerMapper.selectBatchIds(co.stream() .map(EvalProjectCO::getCustomerId).collect(Collectors.toList())) diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java index e06f378..67c37f1 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectGatewayImpl.java @@ -16,9 +16,7 @@ import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.qinan.safetyeval.infrastructure.convertor.EvalProjectDoConvertor; import org.qinan.safetyeval.infrastructure.dataobject.EvalProjectDO; -import org.qinan.safetyeval.infrastructure.dataobject.EvalSurveyDO; import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMapper; -import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper; import org.qinan.safetyeval.infrastructure.mapper.EvalSurveyMapper; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; import org.qinan.safetyeval.infrastructure.support.OrgContextResolver; @@ -30,7 +28,6 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.time.LocalDate; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -178,30 +175,7 @@ public class EvalProjectGatewayImpl implements EvalProjectGateway { if (StringUtils.hasText(query.getKeyword())) { wrapper.and(o -> o.like(EvalProjectDO::getProjectName, query.getKeyword()).or().like(EvalProjectDO::getProjectNo, query.getKeyword())); } - // app查询(已完成的勘察打卡) - List pIds = evalSurveyMapper.selectList(new LambdaQueryWrapper() - .eq(EvalSurveyDO::getPersonnelId, AuthUserContextAdapter.getCurrentUserId()) - .isNotNull(EvalSurveyDO::getSignOutTime)).stream().map(EvalSurveyDO::getProjectId) - .distinct() - .collect(Collectors.toList()); - if (query.getSurveyType() == 1) { - wrapper.in(EvalProjectDO::getId, CollectionUtils.isEmpty(pIds) ? Collections.singletonList(0L) : pIds); - } - if (query.getSurveyType() == 0) { - List myPIds = evalProjectMapper.getByPersonnelId(AuthUserContextAdapter.getCurrentUserId()); - List unfinishedIds = new ArrayList<>(); - if (!CollectionUtils.isEmpty(pIds)) { - for (Long peId : myPIds) { - if (!pIds.contains(peId)) { - unfinishedIds.add(peId); - } - } - } else { - unfinishedIds.addAll(myPIds); - } - wrapper.in(EvalProjectDO::getId, CollectionUtils.isEmpty(unfinishedIds) ? Collections.singletonList(0L) : unfinishedIds); - } - if (Boolean.TRUE.equals(query.getMyProject()) && query.getSurveyType() == 2) { + if (Boolean.TRUE.equals(query.getMyProject())) { wrapper.apply("JSON_CONTAINS(participants_json, JSON_OBJECT('id', {0}))", AuthUserContextAdapter.getCurrentUserId()); } applyProgressStatusFilter(wrapper, query.getProgressStatus());