diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java index ac3043d843..1d00fbfdaa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java @@ -3,7 +3,6 @@ package com.epmet.dao.issue; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.extract.result.IssueInfoResultDTO; import com.epmet.dto.extract.result.IssueProcessInfoResultDTO; -import com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO; import com.epmet.dto.extract.result.SatisfactionInfoResultDTO; import com.epmet.dto.issue.*; import com.epmet.entity.issue.IssueEntity; @@ -173,16 +172,6 @@ public interface StatsIssueDao extends BaseDao { */ List selectIssueVoteInfo(@Param("customerId") String customerId, @Param("dateId") String dateId); - /** - * desc: 根据客户id 获取当前议题的情况 - * - * @param customerId - * @param dateId - * @return java.util.List - * @author LiuJanJun - * @date 2020/9/27 1:22 下午 - */ - List selectIssueVoteStatis(@Param("customerId") String customerId, @Param("dateId") String dateId); List selectCategory(@Param("customerId") String customerId, @Param("ids") Set set); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java index 445894bd66..9c02795140 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java @@ -2,7 +2,6 @@ package com.epmet.service.Issue; import com.epmet.dto.extract.result.IssueInfoResultDTO; import com.epmet.dto.extract.result.IssueProcessInfoResultDTO; -import com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO; import com.epmet.dto.extract.result.SatisfactionInfoResultDTO; import com.epmet.dto.issue.IssueAgencyDTO; import com.epmet.dto.issue.IssueDTO; @@ -163,18 +162,6 @@ public interface IssueService { */ List selectIssueVoteInfo(String customerId, String dateId); - /** - * desc: 【月】查询议题支持反对及应表决人数 - * 数据由两部分组成 1：本月内已经关闭的话题的支持和反对数据 来自issue，issue_vote_statistical - * - * @param customerId - * @param monthId - * @return java.util.List - * @author LiuJanJun - * @date 2020/9/27 11:20 上午 - */ - List selectIssueVoteStatis(String customerId, String monthId); - /** * @Description 查找项目的分类名称 以-相连，以,分隔， * @param param @@ -184,27 +171,6 @@ public interface IssueService { */ Map> getIntegratedProjectCategory(Map> param,String customerId); - /** - * 获取议题总数 - * @author zhaoqifeng - * @date 2021/7/20 16:20 - * @param customerId - * @param date - * @return java.util.List - */ - List getIssueTotalList(String customerId, String date); - - - /** - * 获取议题增量 - * @author zhaoqifeng - * @date 2021/7/20 16:20 - * @param customerId - * @param date - * @return java.util.List - */ - List getIssueIncrList(String customerId, String date); - /** * @Author sun * @Description 查询议题库已删除网格下可能存在的项目Id集合 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java index b86b6daa40..3122b0a1d2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java @@ -7,7 +7,6 @@ import com.epmet.constant.DataSourceConstant; import com.epmet.dao.issue.StatsIssueDao; import com.epmet.dto.extract.result.IssueInfoResultDTO; import com.epmet.dto.extract.result.IssueProcessInfoResultDTO; -import com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO; import com.epmet.dto.extract.result.SatisfactionInfoResultDTO; import com.epmet.dto.issue.*; import com.epmet.entity.issue.IssueEntity; @@ -141,11 +140,6 @@ public class IssueServiceImpl implements IssueService { return statsIssueDao.selectIssueVoteInfo(customerId, dateId); } - @Override - public List selectIssueVoteStatis(String customerId, String dateId) { - return statsIssueDao.selectIssueVoteStatis(customerId, dateId); - } - /** * @Description 查找项目的分类名称 以-相连，以,分隔， * @param param @@ -177,34 +171,6 @@ public class IssueServiceImpl implements IssueService { return map; } - /** - * 获取议题总数 - * - * @param customerId - * @param date - * @return java.util.List - * @author zhaoqifeng - * @date 2021/7/20 16:20 - */ - @Override - public List getIssueTotalList(String customerId, String date) { - return null; - } - - /** - * 获取议题增量 - * - * @param customerId - * @param date - * @return java.util.List - * @author zhaoqifeng - * @date 2021/7/20 16:20 - */ - @Override - public List getIssueIncrList(String customerId, String date) { - return null; - } - /** * @Author sun * @Description 查询议题库已删除网格下可能存在的项目Id集合 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml index 514f743353..4c7152c4c7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml @@ -332,7 +332,7 @@ WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} - AND DATE(UPDATED_TIME) #{date} + AND DATE(CREATED_TIME) #{date} GROUP BY ORG_ID, ISSUE_STATUS @@ -349,4 +349,4 @@ - \ No newline at end of file +