diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index ad1675134..8d95b3d70 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -151,8 +151,11 @@ http://localhost:9411 - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 + + + + wx5d3e97461d248397 + bfed51b731e53db9affb9e6131e7ae12 wx9f20a46906ab2c3e dc13065f79429979d9f687d249eb5c4e diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index e5fb73433..faf48b235 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -198,8 +198,11 @@ 111 111 - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 + + + + wx5d3e97461d248397 + bfed51b731e53db9affb9e6131e7ae12 wx9f20a46906ab2c3e dc13065f79429979d9f687d249eb5c4e diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 2886ef786..819627e0e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -179,8 +179,11 @@ test - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 + + + + wx5d3e97461d248397 + bfed51b731e53db9affb9e6131e7ae12 wx9f20a46906ab2c3e dc13065f79429979d9f687d249eb5c4e diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 19a7fc53e..00dfcacfa 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -362,12 +362,14 @@ public class EventCommentServiceImpl extends BaseServiceImpl> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO) { - List list = baseDao.selectWorkHotOrNewEventComment(formDTO); + public Result> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List list = baseDao.selectWorkHotOrNewEventComment(formDto); return new Result>().ok(list); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java index 143416b02..04f0c83e9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.dto.events.*; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -134,7 +135,7 @@ public interface EpdcEventsDao extends BaseDao { * @param deptIdList * @return */ - Map selectCountOfEventState(@Param("deptIdList") List deptIdList); + IssueStateStatisticsResultDTO selectCountOfEventState(@Param("deptIdList") List deptIdList); /** * 查询待回应列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index 97a789e9d..c39f6874d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import java.util.List; @@ -187,7 +188,7 @@ public interface EpdcEventsService extends BaseService { * @param deptIdList * @return */ - Map selectCountOfEventState(List deptIdList); + IssueStateStatisticsResultDTO selectCountOfEventState(List deptIdList); /** * 待回应列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 7dc0c825c..86324a337 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -43,6 +43,7 @@ import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; import com.elink.esua.epdc.modules.category.service.CategoryService; @@ -417,7 +418,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl deptIdList) { + public IssueStateStatisticsResultDTO selectCountOfEventState(List deptIdList) { return baseDao.selectCountOfEventState(deptIdList); } 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 07b36985e..93d41824f 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 @@ -136,7 +136,7 @@ public interface IssueDao extends BaseDao { * @param deptIdList * @return */ - Map selectCountOfIssueState(@Param("deptIdList") List deptIdList); + IssueStateStatisticsResultDTO selectCountOfIssueState(@Param("deptIdList") List deptIdList); /** * 工作端-议题待处理或者已关闭的最新最热列表 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 5f3a3c252..515a67903 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 @@ -417,15 +417,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp }else { list = SecurityUser.getUser().getDeptIdList(); } - Map map1 = baseDao.selectCountOfIssueState(list); - Map map2 = epdcEventsService.selectCountOfEventState(list); - - IssueStateStatisticsResultDTO dto = new IssueStateStatisticsResultDTO(); - dto.setClosed(Integer.parseInt(map1.get("closed").toString())); - dto.setPendingHandleNum(Integer.parseInt(map1.get("pendingHandleNum").toString())); - dto.setRejectedNum(Integer.parseInt(map2.get("rejectedNum").toString())); - dto.setPendingResponseNum(Integer.parseInt(map2.get("pendingResponseNum").toString())); - return new Result().ok(dto); + IssueStateStatisticsResultDTO issueDto = baseDao.selectCountOfIssueState(list); + IssueStateStatisticsResultDTO eventDto = epdcEventsService.selectCountOfEventState(list); + issueDto.setPendingResponseNum(eventDto.getPendingResponseNum()); + issueDto.setRejectedNum(eventDto.getRejectedNum()); + return new Result().ok(issueDto); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 221f6d5ae..c59cf4e12 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -219,11 +219,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result> listItemsByWork(ItemFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); - System.out.println("userid"); - System.out.println(SecurityUser.getUserId()); - System.out.println("user"); - System.out.println(SecurityUser.getUser()); - System.out.println(SecurityUser.getUser().getDeptIdList()); List data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList()); return new Result>().ok(data); } @@ -631,14 +626,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 吹哨处理 }else if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { List deptList = dto.getDeptResultDTOS(); - // 拼接被吹哨部门Id + // 拼接被吹哨部门 String whistlDept = ""; for (int i =0; i < deptList.size(); i++) { ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i); if (i == 0) { - whistlDept += indexDto.getDeptId(); + whistlDept += indexDto.getDeptName(); } else { - whistlDept += (",".concat(indexDto.getDeptId().toString())); + whistlDept += (",".concat(indexDto.getDeptName())); } } itemInfoDto.setWhistleDept(whistlDept); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml index 1f325a7cf..6c93f9fd2 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml @@ -197,15 +197,15 @@ epdc_event_comment WHERE DEL_FLAG = '0' + AND COMMENT_TYPE = '0' + AND SHIELD_FLAG = '0' AND EVENT_ID = #{eventId} #{timestamp} ORDER BY - ( UN_LIKE_COUNT + LIKE_COUNT + REPLY_COUNT ) DESC + ( UN_LIKE_COUNT + LIKE_COUNT + REPLY_COUNT ) DESC, - CREATED_TIME DESC - LIMIT #{pageIndex},#{pageSize} @@ -245,6 +245,8 @@ WHERE com.DEL_FLAG = '0' AND com.ID = #{commentId} + ORDER BY + rep.CREATED_TIME DESC diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 7ae04d9a1..405abeb70 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -274,10 +274,17 @@ SELECT COUNT(ID) AS num FROM epdc_events WHERE DEL_FLAG = '0' AND grid_id = #{deptId} AND EVENT_STATE = #{state} - SELECT - sum(case when EVENT_STATE=0 then 1 else 0 end ) as rejectedNum, - sum(case when EVENT_STATE=2 then 1 else 0 end ) as pendingResponseNum + CASE + WHEN + SUM( EVENT_STATE = 0 ) IS NULL THEN + 0 ELSE SUM( EVENT_STATE = 0 ) + END AS rejectedNum, + CASE + WHEN SUM( EVENT_STATE = 2 ) IS NULL THEN + 0 ELSE SUM( EVENT_STATE = 2 ) + END AS pendingResponseNum FROM epdc_events WHERE DEL_FLAG = '0' AND GRID_ID IN @@ -307,7 +314,7 @@ #{timestamp} - order by CREATED_TIME + order by CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} 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 46864041e..3a5d17019 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 @@ -441,10 +441,17 @@ AND ID NOT IN ( SELECT ISSUE_ID FROM epdc_issue_handle WHERE DEL_FLAG = '0' AND HANDLER_DEPT_ID = #{deptId} AND STATE ]]> 0 ) - SELECT - sum(case when ISSUE_STATE=0 then 1 else 0 end ) as pendingHandleNum, - sum(case when ISSUE_STATE=2 then 1 else 0 end ) as closed + CASE + WHEN + SUM( ISSUE_STATE = 0 ) IS NULL THEN + 0 ELSE SUM( ISSUE_STATE = 0 ) + END AS pendingHandleNum, + CASE + WHEN SUM( ISSUE_STATE = 2 ) IS NULL THEN + 0 ELSE SUM( ISSUE_STATE = 2 ) + END AS closed FROM epdc_issue WHERE @@ -517,6 +524,7 @@ + @@ -539,6 +547,7 @@ issue.USER_FACE, issue.ISSUE_ADDRESS, issue.CATEGORY_FULL_NAME, + issue.MOBILE, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.BROWSE_NUM, diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml index 753021b95..52f4804bc 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml @@ -29,7 +29,7 @@ WHERE information.DEL_FLAG = '0' AND information.READ_FLAG = '1' - + AND information.DEPT_ID = #{deptId} AND information.DEPT_ID IN diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index cddfad6ab..7aca23c92 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -190,8 +190,11 @@ 111 111 - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 + + + + wx5d3e97461d248397 + bfed51b731e53db9affb9e6131e7ae12