diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 0d6476adb..66fedfe53 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -53,6 +53,9 @@ public class IssueServiceImpl implements IssueService { if (null == userDetail) { return new Result().error("获取用户信息失败"); } + if (formDto.getEventContent().length() > 2000) { + return new Result().error("事件内容不能超过2000字符"); + } // 上传内容安全检查 wxMaSecCheckTask.checkMessage(formDto.getEventContent()); // 获取该网格所有上级机构 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java index 4a81872ad..7c08ba731 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java @@ -28,5 +28,5 @@ public class ItemHandleProgressResultDTO implements Serializable { /** * 操作人部门 */ - private String handlerDeptName; + private String handlerDept; } 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 52f39d71d..a06451c48 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 @@ -149,14 +149,16 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl implem for (ItemCirculationDeptResultDTO circulationDeptResultDTO: dto.getDeptResultDTOS()) { if (!"".equals(typeKey) && !typeKey.equals(circulationDeptResultDTO.getTypeKey())) { - return new Result().error("不可跨部门流转协助,请重新选择流转协助部门"); + return new Result().error("不可跨级流转协助,请重新选择流转协助部门"); } typeKey = circulationDeptResultDTO.getTypeKey(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 158a2495c..942ef1c8d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -23,7 +23,7 @@ - + @@ -45,7 +45,7 @@ cate.CATEGORY_NAME, img.IMG_URL, hp.CREATED_TIME AS handleTime, - hp.HANDLE_ADVICE, + hp.OUT_HANDLE_ADVICE, CASE item.ITEM_STATE WHEN 0 THEN @@ -286,7 +286,7 @@ SELECT CREATED_TIME AS createdTime, advice, - HANDLER_DEPT_NAME AS handlerDeptName, + HANDLER_DEPT AS handlerDept, CASE STATE WHEN 0 THEN '【审核通过】' WHEN 1 THEN '【反馈】' WHEN 2 THEN '【已关闭】' ELSE '' END AS progressName FROM epdc_issue_handle