From 6f0fee8a49eb31b9231924ab9de2c7e5f7995fd4 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 8 Sep 2022 09:53:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E7=BB=93=E6=A1=88=E8=AF=9D=E6=9C=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index a62987e12..991c79d46 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -2589,8 +2589,8 @@ public class ItemServiceImpl extends BaseServiceImpl 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())){ From 438e2503d87d694ec545b7f21f3906d0c0acbe45 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 8 Sep 2022 10:23:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-?= =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84=E4=BB=B7=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java | 4 ++++ .../src/main/resources/mapper/item/ItemDao.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java index d6eb2a0e6..01d3eb6e5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java +++ b/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; /** * 项目内容 */ 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 7721ca5b2..f7283ea4e 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 @@ -1333,6 +1333,7 @@ + @@ -1358,6 +1359,7 @@ item.NICK_NAME, item.DISTRIBUTE_TIME, item.MOBILE, + item.ITEM_STATE, item.ITEM_CONTENT, item.ISSUE_ADDRESS, item.ISSUE_LATITUDE,