From 8a577fbff75e0af02de04fbe5ac5c4790bf7cfc8 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 7 Sep 2022 21:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E8=AF=89?= =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8/=E8=AF=A6=E6=83=85=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ItemAppealDetailResultDTO.java | 18 +++++++++++++ .../item/result/ItemAppealPageResultDTO.java | 18 +++++++++++++ .../item/controller/ItemController.java | 2 ++ .../item/service/impl/ItemServiceImpl.java | 13 ++++----- .../main/resources/mapper/item/ItemDao.xml | 27 +++++++++++++++++-- 5 files changed, 70 insertions(+), 8 deletions(-) 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 466f8de3c..f61a85d4a 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 @@ -88,6 +88,24 @@ public class ItemAppealDetailResultDTO implements Serializable { */ private String peopleFlag; + /** + * 满意度评价得分 + */ + private Integer evaluationScore; + + /** + * 满意度评价名称 + */ + private String evaluationScoreName; + /** + * 满意度评价内容 + */ + private String evaluationContent; + /** + * 满意度评价时间 + */ + private String evaluationTime; + /** * 执法详情 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java index 517da9fc0..79151cd44 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java @@ -72,4 +72,22 @@ public class ItemAppealPageResultDTO implements Serializable { * 上报时间 */ private String createdTime; + + /** + * 满意度评价得分 + */ + private Integer evaluationScore; + + /** + * 满意度评价名称 + */ + private String evaluationScoreName; + /** + * 满意度评价内容 + */ + private String evaluationContent; + /** + * 满意度评价时间 + */ + private String evaluationTime; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 324083630..7ab817467 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -302,6 +302,7 @@ public class ItemController { * @params [dto] * @return com.elink.esua.epdc.commons.tools.utils.Result> */ + // todo jackWang 补充满意度详情 @GetMapping("getItemAppealPage") public Result> getItemAppealPage(@RequestParam Map params){ PageData page = itemService.getItemAppealPage(params); @@ -315,6 +316,7 @@ public class ItemController { * @params [id] * @return com.elink.esua.epdc.commons.tools.utils.Result> */ + // todo jackWang 补充满意度详情 @GetMapping("getItemAppealDetail/{id}") public Result getItemAppealDetail(@PathVariable("id") String id){ return itemService.getItemAppealDetail(id); 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 d120267e6..98374bffb 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 @@ -1564,10 +1564,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem //事件来源 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_FZ); //事件描述 - sendDto.setSJMS("测试事件，请勿处理"+itemEntity.getItemContent());// + sendDto.setSJMS(itemEntity.getItemContent());// }else{ //事件描述 - sendDto.setSJMS("测试事件，请勿处理"+getItemLawContent(itemEntity.getId())); + sendDto.setSJMS(getItemLawContent(itemEntity.getId())); //事件来源 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_ZF); //备注 @@ -1607,7 +1607,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //所属社区 sendDto.setSSSQ(deptInfo.getCommunityInfoCode()); //事件描述 - sendDto.setSJMS("测试事件，请勿处理"+itemEntity.getItemContent());// + sendDto.setSJMS(itemEntity.getItemContent());// } //推送端记录唯一标识 sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", "")); @@ -2575,12 +2575,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setId(UUID.randomUUID().toString().replaceAll("-", "")); itemHandleProcessDto.setItemId(itemPlat.getReferenceId()); if("0".equals(formDto.getState())){ - itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); ItemEntity item = baseDao.selectById(itemPlat.getReferenceId()); + itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue()); + // todo jackWang 推到网格化时的结案申请内容+办理人：XXX+办理电话：XXX。换行 感谢您的支持，“北尚诉办”全程为您服务！ + itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()+" 办理人：XXX+办理电话：XXX。\n感谢您的支持，“北尚诉办”全程为您服务！"); item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue()); updateById(item); }else if("1".equals(formDto.getState())){ itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue()); + itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); }else{ // 保存接口调用日志 this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), @@ -2588,8 +2591,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error("状态信息有误"); } itemHandleProcessDto.setHandleAdvice(formDto.getHandleAdvice()); - // todo 意见拼接联系人姓名和手机号 - itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()); itemHandleProcessDto.setHandlerDept("网格化平台"); itemHandleProcessDto.setCreatedTime(new Date()); itemHandleProcessDto.setUpdatedTime(new Date()); 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 97b8bd392..dd39664a1 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 @@ -1291,7 +1291,16 @@ WHEN '1' THEN '发展诉求' WHEN '2' THEN '执法诉求' ELSE '' - END AS peopleFlagName + END AS peopleFlagName, + EVALUATION_SCORE, + case EVALUATION_SCORE + when '0' then '不满意' + when '1' then '基本满意' + when '2' then '非常满意' + else '' + end as evaluationScoreName, + EVALUATION_CONTENT, + EVALUATION_TIME FROM epdc_item i where i.DEL_FLAG='0' @@ -1335,6 +1344,10 @@ + + + + @@ -1357,7 +1370,17 @@ img.IMG_URL, item.ITEM_VOICE, item.DURATION, - item.CONTACT_NAME + item.CONTACT_NAME, + EVALUATION_SCORE, + case EVALUATION_SCORE + when '0' then '不满意' + when '1' then '基本满意' + when '2' then '非常满意' + else '' + end as evaluationScoreName, + EVALUATION_CONTENT, + EVALUATION_TIME + FROM epdc_item item LEFT JOIN epdc_img img ON item.id = img.REFERENCE_ID AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events'