【内容审核】-【后台列表添加部门信息】-（王童）-2020/8/5

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<CheckImgsDetailsDTO> imgUrls;
 
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 }

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<ViolationsDetailsDTO> imgUrls;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
 
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 
 }

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<ViolationsReco
 
     @Override
     public PageData<ViolationsRecordsDTO> page(Map<String, Object> params) {
-//        params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
-//        params.put("creatUser",SecurityUser.getUser().getId());
         IPage<ViolationsRecordsDTO> page = getPage(params);
         List<ViolationsRecordsDTO> list = baseDao.getViolationsRecord(params);
         return new PageData<>(list, page.getTotal());

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`

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`

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();
     }
 
     /**

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<EpdcEventsDao, EpdcEv
                     dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList,
                     dto.getImages(), null,contentResult, imgResult,null,dto.getMobile(),"0",deptDto);
             contentSecurityFeign.insertViolationsRecord(record);
-//            throw new RenException(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
             return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
         }