elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

北尚诉办-诉求列表/详情补充满意度评价

feature/dangjian
Jackwang 3 years ago
parent
a67d3b1937
commit
8a577fbff7
5 changed files with 70 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java
  2. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
  3. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  4. 13
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  5. 27
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

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

@ -88,6 +88,24 @@ public class ItemAppealDetailResultDTO implements Serializable {
*/
private String peopleFlag;
/**
* 满意度评价得分
*/
private Integer evaluationScore;
/**
* 满意度评价名称
*/
private String evaluationScoreName;
/**
* 满意度评价内容
*/
private String evaluationContent;
/**
* 满意度评价时间
*/
private String evaluationTime;
/**
* 执法详情
*/

18
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
View File

@ -72,4 +72,22 @@ public class ItemAppealPageResultDTO implements Serializable {
* 上报时间
*/
private String createdTime;
/**
* 满意度评价得分
*/
private Integer evaluationScore;
/**
* 满意度评价名称
*/
private String evaluationScoreName;
/**
* 满意度评价内容
*/
private String evaluationContent;
/**
* 满意度评价时间
*/
private String evaluationTime;
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
View File

@ -302,6 +302,7 @@ public class ItemController {
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
*/
// todo jackWang 补充满意度详情
@GetMapping("getItemAppealPage")
public Result<PageData<ItemAppealPageResultDTO>> getItemAppealPage(@RequestParam Map<String, Object> params){
PageData<ItemAppealPageResultDTO> page = itemService.getItemAppealPage(params);
@ -315,6 +316,7 @@ public class ItemController {
* @params [id]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
*/
// todo jackWang 补充满意度详情
@GetMapping("getItemAppealDetail/{id}")
public Result<ItemAppealDetailResultDTO> getItemAppealDetail(@PathVariable("id") String id){
return itemService.getItemAppealDetail(id);

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

@ -1564,10 +1564,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> 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<ItemDao, ItemEntity> implem
return new Result().error("状态信息有误");
}
itemHandleProcessDto.setHandleAdvice(formDto.getHandleAdvice());
// todo 意见拼接联系人姓名和手机号
itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice());
itemHandleProcessDto.setHandlerDept("网格化平台");
itemHandleProcessDto.setCreatedTime(new Date());
itemHandleProcessDto.setUpdatedTime(new Date());

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

@ -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 @@
<result property="itemVoice" column="ITEM_VOICE"/>
<result property="duration" column="DURATION"/>
<result property="contactName" column="CONTACT_NAME"/>
<result property="evaluationScore" column="EVALUATION_SCORE"/>
<result property="evaluationScoreName" column="evaluationScoreName"/>
<result property="evaluationContent" column="EVALUATION_CONTENT"/>
<result property="evaluationTime" column="EVALUATION_TIME"/>
<collection property="images" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
@ -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'

Write Preview
Loading…
Cancel
Save