修改BUG

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());
         // 获取该网格所有上级机构

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;
 }

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<EpdcEventsDao, EpdcEv
         // 更新事件表审核状态
         updateById(entity);
 
+        EpdcEventsEntity eventsEntity = baseDao.selectById(dto.getId());
+
         // 组装发送消息内容
         EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
-        informationFormDTO.setUserId(entity.getUserId());
-        informationFormDTO.setContent(entity.getEventContent());
+        informationFormDTO.setUserId(eventsEntity.getUserId());
+        informationFormDTO.setContent(eventsEntity.getEventContent());
         informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_EVENT_NOT_PASSED);
         informationFormDTO.setType(EventsNoticeConstant.NOTICE_TYPE_AUDIT_NOTICE);
         informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE__BUSINESS_TYPE_EVENT);
-        informationFormDTO.setBusinessId(entity.getId());
+        informationFormDTO.setBusinessId(eventsEntity.getId());
 
         // 审核通过
         if (EventIssueItemState.EVENT_REVIEW_PASS== dto.getEventState()) {

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -466,7 +466,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         for (ItemCirculationDeptResultDTO circulationDeptResultDTO:
                 dto.getDeptResultDTOS()) {
             if (!"".equals(typeKey) && !typeKey.equals(circulationDeptResultDTO.getTypeKey())) {
-                return new Result().error("不可跨部门流转协助，请重新选择流转协助部门");
+                return new Result().error("不可跨级流转协助，请重新选择流转协助部门");
             }
             typeKey = circulationDeptResultDTO.getTypeKey();
         }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -23,7 +23,7 @@
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="latestProgress.progressName" column="stateName"/>
         <result property="latestProgress.createdTime" column="handleTime"/>
-        <result property="latestProgress.advice" column="HANDLE_ADVICE"/>
+        <result property="latestProgress.advice" column="OUT_HANDLE_ADVICE"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -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