From eab752daf4fc8c0b474364946448cea5fdd2939a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 5 Aug 2020 17:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E3=80=91-=E3=80=90=E5=90=8E=E5=8F=B0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E3=80=91?= =?UTF-8?q?-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dto/CheckRecordsDTO.java | 10 ++++++++++ .../com/elink/esua/epdc/dto/ViolationsRecordsDTO.java | 8 ++++++++ .../service/impl/ViolationsRecordsServiceImpl.java | 2 -- .../src/main/resources/mapper/CheckRecordsDao.xml | 4 +++- .../src/main/resources/mapper/ViolationsRecordsDao.xml | 4 +++- .../events/controller/EpdcAppEventsController.java | 1 - .../events/service/impl/EpdcEventsServiceImpl.java | 1 - 7 files changed, 24 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java index 0a5e55ecc..a6044fcbf 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java @@ -156,4 +156,14 @@ public class CheckRecordsDTO implements Serializable { private List imgUrls; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 所有部门 + */ + private String allDeptNames; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java index a3bf1dc25..50b2497d2 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java @@ -112,6 +112,14 @@ public class ViolationsRecordsDTO implements Serializable { private List imgUrls; + /** + * 部门名称 + */ + private String deptName; + /** + * 所有部门 + */ + private String allDeptNames; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java index c5aac96a8..5fdc29653 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java @@ -57,8 +57,6 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl page(Map params) { -// params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); -// params.put("creatUser",SecurityUser.getUser().getId()); IPage page = getPage(params); List list = baseDao.getViolationsRecord(params); return new PageData<>(list, page.getTotal()); diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml index 5bd20a1fc..9df1fd12b 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml @@ -38,7 +38,9 @@ st.DESCRIPTION as SUGGESTION, st.code as suggestionCode, date_format(ecr.CREATED_TIME,'%Y-%m-%d %H:%i') as CREATED_TIME, - date_format(ecr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME + date_format(ecr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME, + ecr.DEPT_NAME, + ecr.ALL_DEPT_NAMES FROM `epdc_check_records` ecr left join epdc_check_code mo on ecr.MODULE=mo.`CODE` left join epdc_check_code la on ecr.LABEL=la.`CODE` diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml index 6e1b8ff94..68b174aed 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml @@ -35,7 +35,9 @@ la.DESCRIPTION as label, IF(evr.DECISION='1','系统判定','人工审核') decision, date_format(evr.CREATED_TIME,'%Y-%m-%d %H:%i') as CREATED_TIME, - date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME + date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME, + evr.DEPT_NAME, + evr.ALL_DEPT_NAMES FROM `epdc_violations_records` evr left join epdc_check_code mo on evr.MODULE=mo.`CODE` left join epdc_check_code la on evr.LABEL=la.`CODE` diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java index 16b8a0272..125b16e35 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java @@ -37,7 +37,6 @@ public class EpdcAppEventsController { //效验数据 ValidatorUtils.validateEntity(formDto); return epdcEventsService.saveEvent(formDto); -// return new Result(); } /** 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 b2b89540b..5582a3899 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 @@ -187,7 +187,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl