diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java index 69da09b886..aa4a89183e 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.evaluationindex.screen.dto.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -13,9 +14,26 @@ import java.io.Serializable; public class ScreenProjectDistributionFormDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 目前只有平阴在传,默认赋值:370124 + */ private String areaCode; + /** + * 如果为空返回全部;可选值:1:红色事件;2:黄色事件;3:绿色事件 + */ private String level; + /** + * 当前组织id + */ + @NotBlank(message = "agencyId不能为空") private String agencyId; + + + /** + * 不必填;默认查询的是处理中;可选值:all: 全部,pending:处理中 已结案:closed_case ;已关闭:closed + * 默认查询pending + */ + private String status; } 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 cc7a55528e..a9ac375c02 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 @@ -18,7 +18,6 @@ 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 lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -62,9 +61,10 @@ public class ScreenProjectController { */ @PostMapping("projectdistribution") public Result projectDistribution(@RequestBody ScreenProjectDistributionFormDTO formDTO){ - if (StringUtils.isBlank(formDTO.getAreaCode()) && StringUtils.isBlank(formDTO.getAgencyId())){ + /*if (StringUtils.isBlank(formDTO.getAreaCode()) && StringUtils.isBlank(formDTO.getAgencyId())){ formDTO.setAreaCode("370124"); - } + }*/ + ValidatorUtils.validateEntity(formDTO); return screenProjectService.projectDistribution(formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java index 6ac5ef48ea..eeb9831e21 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java @@ -10,7 +10,10 @@ import java.util.List; @Mapper public interface ScreenProjectDataDao { - List projectDistribution(@Param("agencyId") String agencyId, @Param("ids") List ids, @Param("level") String level); + List projectDistribution(@Param("agencyId") String agencyId, + @Param("ids") List ids, + @Param("level") String level, + @Param("status")String status); List selectIdsByAreaCode(@Param("areaCode") String areaCode); 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 f8832532b1..97dafab068 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,11 +70,14 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { @Override @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) public Result projectDistribution(ScreenProjectDistributionFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getStatus())){ + formDTO.setStatus("pending"); + } List areaIds = null; if (StringUtils.isNotBlank(formDTO.getAreaCode())){ areaIds = screenProjectDataDao.selectIdsByAreaCode(formDTO.getAreaCode()); } - List resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel()); + List resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel(),formDTO.getStatus()); return new Result().ok(resultDTOS); } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index b59665f53e..08e88bbeae 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -27,6 +27,13 @@ and org_id = #{agencyId} + + + + + and PROJECT_STATUS_CODE=#{status} + +