diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java index 075b3c8ce7..d93871bd55 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java @@ -14,4 +14,8 @@ import java.io.Serializable; public class ProjectChangedMQMsg implements Serializable { private String customerId; + /** + * 操作类型 议题转项目issue_shift_project, 处理:response, 结案close,退回return,部门流转transfer,立项created + */ + private String operation; } 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 aa4a89183e..7e7e6794f1 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 @@ -22,6 +22,7 @@ public class ScreenProjectDistributionFormDTO implements Serializable { /** * 如果为空返回全部;可选值:1:红色事件;2:黄色事件;3:绿色事件 */ + @NotBlank(message = "level不能为空") private String level; /** @@ -31,9 +32,9 @@ public class ScreenProjectDistributionFormDTO implements Serializable { private String agencyId; - /** + /* *//** * 不必填;默认查询的是处理中;可选值:all: 全部,pending:处理中 已结案:closed_case ;已关闭:closed * 默认查询pending - */ - private String status; + *//* + private String status;*/ } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java index 839870a4ab..ec2c9e5219 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.evaluationindex.screen.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @description: @@ -29,4 +31,10 @@ public class ScreenProjectDistributionResultDTO implements Serializable { */ private String longitude; private String latitude; + + + private String customerId; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date projectCreateTime; } 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 eeb9831e21..559ce9fe2d 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 @@ -12,8 +12,7 @@ public interface ScreenProjectDataDao { List projectDistribution(@Param("agencyId") String agencyId, @Param("ids") List ids, - @Param("level") String level, - @Param("status")String status); + @Param("level") String level); 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 c7a1e6cfc5..81be998afb 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,14 +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"); - } + // 1:红色:为刚提交未做任何响应处理未结案的项目; + // 2:黄色: 至少做过一次响应处理答复但未结案的项目; + // 3:绿色:已经结案的项目。 List areaIds = null; if (StringUtils.isNotBlank(formDTO.getAreaCode())){ areaIds = screenProjectDataDao.selectIdsByAreaCode(formDTO.getAreaCode()); } - List resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel(),formDTO.getStatus()); + List resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel()); 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 08e88bbeae..7369a2a36c 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 @@ -10,7 +10,9 @@ project_level AS level, project_id AS id, longitude AS longitude, - latitude AS latitude + latitude AS latitude, + PROJECT_CREATE_TIME AS projectCreateTime, + CUSTOMER_ID AS customerId FROM screen_project_data WHERE @@ -27,13 +29,23 @@ and org_id = #{agencyId} + - + + and PROJECT_STATUS_CODE ='pending' + + + and PROJECT_STATUS_CODE ='pending' + + + and PROJECT_STATUS_CODE !='pending' + and DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(PROJECT_CREATE_TIME) - and PROJECT_STATUS_CODE=#{status} + and PROJECT_STATUS_CODE ='pending' + order by PROJECT_CREATE_TIME desc