From b35a26ee3a2c86d9af8a34e7a4ae24bcb3b1ee9f Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 21 Jul 2021 16:18:08 +0800 Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E3=80=81=E5=B7=A5=E4=BD=9C=E7=AB=AF?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=92=8C=E8=AE=AE=E9=A2=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E4=BA=8B=E4=BB=B6=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E8=A1=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IssuePendingResponseFormDTO.java | 5 +++ .../dto/issue/form/WorkIssueListFormDTO.java | 5 ++- .../controller/EpdcEventsController.java | 2 - .../service/impl/EpdcEventsServiceImpl.java | 16 ++++++++ .../issue/controller/IssueController.java | 1 - .../issue/service/impl/IssueServiceImpl.java | 11 ++++++ .../resources/mapper/events/EpdcEventsDao.xml | 37 ++++++++++++++----- .../main/resources/mapper/issue/IssueDao.xml | 18 +++++++-- 8 files changed, 77 insertions(+), 18 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java index f3854867..45b44954 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java @@ -41,4 +41,9 @@ public class IssuePendingResponseFormDTO implements Serializable { */ private String timestamp; + /** + * 工作人员ID + */ + private Long workUserId; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java index 58d69343..9cb3eb49 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java @@ -47,6 +47,9 @@ public class WorkIssueListFormDTO implements Serializable { */ private Integer issueState; - + /** + * 工作人员ID + */ + private Long workUserId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index 9991727e..9d92dfd3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -57,7 +57,6 @@ public class EpdcEventsController { private EpdcEventsService epdcEventsService; @GetMapping("page") - @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public Result> page(@RequestParam Map params){ PageData page = epdcEventsService.listOfPendingReviewEvents(params); @@ -155,7 +154,6 @@ public class EpdcEventsController { * @Date: 2019/9/6 15:11 */ @GetMapping("rejectEvents") - @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public Result> rejectEvents(@RequestParam Map params){ PageData page = epdcEventsService.listOfRejectEvents(params); return new Result>().ok(page); 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 d74abb9e..171fb302 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 @@ -132,6 +132,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl listOfPendingReviewEvents(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("当前登录状态已失效，请重新登录"); + } + List deptIdList = user.getDeptIdList(); + deptIdList.add(user.getDeptId()); + params.put("deptIdList", deptIdList); + params.put("workUserId", user.getId()); IPage page = getPage(params); List list = baseDao.selectListOfPendingReviewEvents(params); return new PageData<>(list, page.getTotal()); @@ -382,6 +390,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl listOfRejectEvents(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("当前登录状态已失效，请重新登录"); + } + List deptIdList = user.getDeptIdList(); + deptIdList.add(user.getDeptId()); + params.put("deptIdList", deptIdList); + params.put("workUserId", user.getId()); IPage page = getPage(params); List list = baseDao.selectListOfRejectEvents(params); return new PageData<>(list, page.getTotal()); 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 550c173c..81499574 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 @@ -66,7 +66,6 @@ public class IssueController { * @Date: 2019/9/5 16:49 */ @GetMapping("page") - @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public Result> waitHandlePage(@RequestParam Map params){ PageData page = issueService.listOfIssues(params); return new Result>().ok(page); 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 767f3c7c..eedd2537 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 @@ -121,6 +121,15 @@ public class IssueServiceImpl extends BaseServiceImpl imp @Override public PageData listOfIssues(Map params) { + UserDetail user = SecurityUser.getUser(); + if (null == user) { + throw new RenException("当前登录状态已失效，请重新登录"); + } + List deptIdList = user.getDeptIdList(); + deptIdList.add(user.getDeptId()); + params.put("deptIdList", deptIdList); + params.put("workUserId", user.getId()); + IPage page = getPage(params); if (null != params.get("issueCode")) { params.put("issueCode", params.get("issueCode").toString().trim()); @@ -484,6 +493,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp public Result> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); formDto.setPageIndex(pageIndex); + formDto.setWorkUserId(SecurityUser.getUserId()); return epdcEventsService.listIssuePendingResponse(formDto); } @@ -504,6 +514,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp list = SecurityUser.getUser().getDeptIdList(); } formDto.setDeptIdList(list); + formDto.setWorkUserId(SecurityUser.getUserId()); List data = baseDao.selectWorkIssueListOfNewOrHot(formDto); // 查询最热评论 for (WorkIssueListResultDTO dto : data) { 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 ac1e336a..1d845155 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 @@ -68,8 +68,15 @@ temp.CREATED_TIME AS createdTime FROM epdc_events temp + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = temp.ID AND u.DEL_FLAG = '0' WHERE temp.DEL_FLAG = '0' + AND (temp.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -97,8 +104,15 @@ temp.EVENT_CONTENT AS eventContent FROM epdc_events temp + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = temp.ID AND u.DEL_FLAG = '0' WHERE temp.DEL_FLAG = '0' + AND (temp.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -315,18 +329,21 @@ 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 711febdb..125bff9f 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 @@ -17,10 +17,17 @@ issue.ISSUE_CODE FROM epdc_issue issue + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = issue.EVENT_ID AND u.DEL_FLAG = '0' LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID AND e.DEL_FLAG = '0' WHERE issue.DEL_FLAG = '0' + AND (issue.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) and issue.ISSUE_STATE = #{state} AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} @@ -539,15 +546,18 @@ t1.id FROM epdc_issue t1 + LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = t1.EVENT_ID AND u.DEL_FLAG = '0' LEFT JOIN epdc_events t2 ON t1.EVENT_ID = t2.ID AND t2.DEL_FLAG = '0' WHERE t1.DEL_FLAG = '0' AND t1.ISSUE_STATE = #{issueState} - AND t1.GRID_ID IN - - #{id} - + AND (t1.GRID_ID IN + + #{id} + + OR u.WORK_USER_ID = #{workUserId} + ) #{timestamp} ORDER BY ( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,