diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/ScreenIssueCensusDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/ScreenIssueCensusDTO.java new file mode 100644 index 00000000..a428bf1a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/ScreenIssueCensusDTO.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.dto.issue; + +import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; +import lombok.Data; +import springfox.documentation.service.ApiListing; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 大屏统计 + * @Author LC + * @Date 2019/9/6 15:58 + */ +@Data +public class ScreenIssueCensusDTO implements Serializable { + private static final long serialVersionUID = 8931053684837605978L; + + private String date; + + private Integer count; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java index 2e415261..80519237 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java @@ -29,10 +29,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO; -import com.elink.esua.epdc.dto.issue.IssueContentDetailDTO; -import com.elink.esua.epdc.dto.issue.IssueDTO; -import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; -import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; +import com.elink.esua.epdc.dto.issue.*; import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; import com.elink.esua.epdc.modules.issue.excel.IssueExcel; import com.elink.esua.epdc.modules.issue.service.IssueService; @@ -41,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; import java.util.Map; @@ -238,4 +236,17 @@ public class IssueController { IssueContentDetailDTO data = issueService.getIssueContentDetail(id); return new Result().ok(data); } + + /** + * @Description: 锦水大屏月度统计 + * @param id: + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/9/6 15:06 + */ + @GetMapping("screenJinShui/issueCensus") + public Result> screenIssueCensus(@RequestParam String startDate, @RequestParam String endDate, @RequestParam String type) { + List result = issueService.screenIssueCensus(startDate,endDate,type); + return new Result>().ok(result); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index 9cb56cb9..2501d754 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -19,10 +19,7 @@ package com.elink.esua.epdc.modules.issue.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; -import com.elink.esua.epdc.dto.issue.IssueContentDetailDTO; -import com.elink.esua.epdc.dto.issue.IssueDTO; -import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; -import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; +import com.elink.esua.epdc.dto.issue.*; import com.elink.esua.epdc.dto.issue.form.*; import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; @@ -217,4 +214,10 @@ public interface IssueDao extends BaseDao { * @Date 13:49 2022-01-10 **/ List selectListEditIssueProgress(@Param("issueId") String issueId); + + List screenIssueCensusForMonth(@Param("startDate")String startDate, @Param("endDate")String endDate); + + List screenIssueCensusForQuarter(@Param("startDate")String startDate, @Param("endDate")String endDate); + + List screenIssueCensusForYear(@Param("startDate")String startDate, @Param("endDate")String endDate); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 44cc6e99..881721c5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java @@ -23,11 +23,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; +import com.elink.esua.epdc.dto.issue.*; import com.elink.esua.epdc.dto.issue.form.*; -import com.elink.esua.epdc.dto.issue.IssueContentDetailDTO; -import com.elink.esua.epdc.dto.issue.IssueDTO; -import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; -import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; import com.elink.esua.epdc.dto.issue.result.*; @@ -37,6 +34,7 @@ import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.Date; import java.util.List; import java.util.Map; @@ -308,4 +306,6 @@ public interface IssueService extends BaseService { PageData screenJinShuiList(Map params); + + List screenIssueCensus(String startDate, String endDate, String type); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index d501e60d..c07a1dce 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -760,4 +760,27 @@ public class IssueServiceImpl extends BaseServiceImpl imp } + + @Override + public List screenIssueCensus(String startDate, String endDate, String type) { + + List result = new ArrayList<>(); + + // type 月份 季度 年份 + if (type.equals("month")){ + + result = baseDao.screenIssueCensusForMonth(startDate,endDate); + + }else if (type.equals("quarter")){ + + result = baseDao.screenIssueCensusForQuarter(startDate,endDate); + + }else if (type.equals("year")){ + + result = baseDao.screenIssueCensusForYear(startDate,endDate); + + } + + return result; + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 0fe0fd08..2005677b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -718,4 +718,49 @@ AND hd.ISSUE_ID = #{issueId} ORDER BY hd.CREATED_TIME DESC + + + + + +