Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java

@@ -32,6 +32,10 @@ public class ItemAppealDetailResultDTO implements Serializable {
      * 手机号
      */
     private String mobile;
+    /**
+     * 项目状态
+     */
+    private String itemState;
     /**
      * 项目内容
      */

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

@@ -2609,8 +2609,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if("0".equals(formDto.getState())){
             ItemEntity item = baseDao.selectById(itemPlat.getReferenceId());
             itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
-            // todo jackWang 推到网格化时的结案申请内容+办理人：XXX+办理电话：XXX。换行 感谢您的支持，“北尚诉办”全程为您服务！
-            itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()+" 办理人：XXX+办理电话：XXX。\n感谢您的支持，“北尚诉办”全程为您服务！");
+            //内容组成：推到网格化时的结案申请内容+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
+            itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"+,办理电话："+item.getHandlePeopleMobile());
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());
             updateById(item);
         }else if("1".equals(formDto.getState())){

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

@@ -1337,6 +1337,7 @@
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="mobile" column="MOBILE"/>
         <result property="gridId" column="GRID_ID"/>
+        <result property="itemState" column="ITEM_STATE"/>
         <result property="userFace" column="USER_FACE"/>
         <result property="itemContent" column="ITEM_CONTENT"/>
         <result property="issueAddress" column="ISSUE_ADDRESS"/>
@@ -1362,6 +1363,7 @@
             item.NICK_NAME,
             item.DISTRIBUTE_TIME,
             item.MOBILE,
+            item.ITEM_STATE,
             item.ITEM_CONTENT,
             item.ISSUE_ADDRESS,
             item.ISSUE_LATITUDE,