From 54bebb245f95495397f8f0f2c8b7ccf99b277962 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 10 May 2021 11:19:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=87=87=E9=9B=86=E3=80=81?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95=E9=87=87=E9=9B=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/screen/ScreenProjectController.java | 5 +++-- .../screen/ScreenProjectService.java | 7 ++++--- .../screen/impl/ScreenProjectServiceImpl.java | 4 ++-- .../screen/impl/ScreenProjectDataServiceImpl.java | 4 ++-- .../impl/ScreenProjectProcessServiceImpl.java | 14 +++++++++----- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 84e109d3fc..87547a1777 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -17,6 +17,7 @@ import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO; import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO; import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO; +import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -60,9 +61,9 @@ public class ScreenProjectController { * @Date 2021/2/24 16:10 */ @PostMapping("projectdistribution") - public Result projectDistribution(@RequestBody ScreenProjectDistributionFormDTO formDTO){ + public Result> projectDistribution(@RequestBody ScreenProjectDistributionFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); - return screenProjectService.projectDistribution(formDTO); + return new Result>().ok(screenProjectService.projectDistribution(formDTO)); } /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java index b4b0fe8725..b4154a790a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/ScreenProjectService.java @@ -1,12 +1,13 @@ package com.epmet.datareport.service.evaluationindex.screen; import com.epmet.commons.tools.utils.Result; -import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO; -import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO; import com.epmet.dto.form.screen.CategoryAnalysisFormDTO; import com.epmet.dto.result.screen.CategoryAnalysisResultDTO; import com.epmet.evaluationindex.screen.dto.form.ProjectDetailFormDTO; +import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDetailFormDTO; +import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDTO; import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO; +import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO; import java.util.List; @@ -36,7 +37,7 @@ public interface ScreenProjectService { */ List categoryAnalysis(String customerId, CategoryAnalysisFormDTO formDTO); - Result projectDistribution(ScreenProjectDistributionFormDTO formDTO); + List projectDistribution(ScreenProjectDistributionFormDTO formDTO); Result projectDistributionDetail(ScreenProjectDetailFormDTO formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 0c02e07031..bed88ec3d4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -70,7 +70,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { */ @Override @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) - public Result projectDistribution(ScreenProjectDistributionFormDTO formDTO) { + public List projectDistribution(ScreenProjectDistributionFormDTO formDTO) { // 1：红色：为刚提交未做任何响应处理未结案的项目； // 2：黄色: 至少做过一次响应处理答复但未结案的项目； // 3：绿色：已经结案的项目。 @@ -82,7 +82,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { formDTO.setPageSize(NumConstant.TWO_HUNDRED); } List resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel(),formDTO.getPageSize()); - return new Result().ok(resultDTOS); + return resultDTOS; } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java index 501bfa2c43..baf94d5929 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java @@ -123,12 +123,12 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl param) { - if (param.getIsFirst()) { + /*if (param.getIsFirst()) { int affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId()); while (affectedRows > 0) { affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId()); } - } + }*/ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date today = new Date(); param.getDataList().forEach(item -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java index 95206d2fd4..445183e466 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectProcessServiceImpl.java @@ -35,6 +35,7 @@ import com.epmet.entity.evaluationindex.screen.ScreenProjectProcessAttachmentEnt import com.epmet.entity.evaluationindex.screen.ScreenProjectProcessEntity; import com.epmet.service.evaluationindex.screen.ScreenProjectProcessAttachmentService; import com.epmet.service.evaluationindex.screen.ScreenProjectProcessService; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; @@ -122,21 +123,24 @@ public class ScreenProjectProcessServiceImpl extends BaseServiceImpl 0) { affectedRows = baseDao.deleteByDateIdAndCustomerId(param.getCustomerId(), param.getDateId()); } - } + }*/ List processIdList = param.getDataList().stream().map(ScreenProjectProcessFormDTO :: getProcessId).collect(Collectors.toList()).stream().distinct() .collect(Collectors.toList()); if (CollectionUtils.isEmpty(processIdList)){ return; } - //删除旧数据 - baseDao.deleteByProcessIds(param.getCustomerId(), processIdList); - screenProjectProcessAttachmentDao.deleteByProcessIds(param.getCustomerId(), processIdList); + Lists.partition(processIdList, NumConstant.TWO_HUNDRED).forEach(list -> { + //删除旧数据 + baseDao.deleteByProcessIds(param.getCustomerId(), list); + screenProjectProcessAttachmentDao.deleteByProcessIds(param.getCustomerId(), list); + }); + List attachmentList = new ArrayList<>();