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 81499574..2e415261 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 @@ -213,4 +213,29 @@ public class IssueController { return issueService.modifyCommentById(eventDeleteCommentsFormDTO.getCommentIds()); } -} + /** + * @Description: 锦水大屏事件列表 + * @param params: + * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/9/6 15:06 + */ + @GetMapping("screenJinShui/page") + public Result> screenJinShuiList(@RequestParam Map params){ + PageData page = issueService.screenJinShuiList(params); + return new Result>().ok(page); + } + + /** + * @Description: 锦水大屏事件详情 + * @param id: + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/9/6 15:06 + */ + @GetMapping("screenJinShui/issueContentDetail/{id}") + public Result screenJinIssueContentDetail(@PathVariable("id") String id) { + IssueContentDetailDTO data = issueService.getIssueContentDetail(id); + return new Result().ok(data); + } +} \ 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 5dac83a9..9cb56cb9 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 @@ -50,6 +50,9 @@ public interface IssueDao extends BaseDao { */ List selectListOfIssueWaitHandleOrClosed(Map params); + + List screenList(Map params); + /** * 议题待处理列表详情 * @Params: [id] 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 586b60bb..44cc6e99 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 @@ -35,6 +35,7 @@ import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; 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.List; import java.util.Map; @@ -306,4 +307,5 @@ public interface IssueService extends BaseService { List listEditIssueProgress(String issueId); + PageData screenJinShuiList(Map params); } 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 a9d38677..40f25339 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 @@ -74,6 +74,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestParam; import java.util.*; @@ -747,4 +748,16 @@ public class IssueServiceImpl extends BaseServiceImpl imp public List listEditIssueProgress(String issueId) { return baseDao.selectListEditIssueProgress(issueId); } + + @Override + public PageData screenJinShuiList( Map params) { + + + IPage page = getPage(params); + + List list = baseDao.selectListOfIssueWaitHandleOrClosed(params); + return new PageData<>(list, page.getTotal()); + + + } } 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 3e08cb1b..0fe0fd08 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 @@ -54,6 +54,32 @@ issue.CREATED_TIME DESC + + + +