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

北尚诉办-bug完善

feature/dangjian
Jackwang 3 years ago
parent
18b68edfc8
commit
f0022e1ff4
3 changed files with 22 additions and 50 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. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java
  2. 63
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

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

@ -29,9 +29,14 @@ public class ItemHandleProgressResultDTO implements Serializable {
*/
private String createdTime;
/**
* 意见
* 回复居民意见
*/
private String advice;
/**
* 部门意见
*/
private String deptAdvice;
/**
* 操作人部门
*/

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

@ -878,6 +878,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
handleProcessEntity.setItemId(dto.getId());
handleProcessEntity.setHandleAdvice(dto.getHandleAdvice());
handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice());
//当前操作人部门tyeKey
String sendTypeKey = "";
log.info("处理项目-进入判断");
// 吹哨
if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
@ -928,8 +930,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT);
// 记录处理记录
itemHandleProcessService.insert(handleProcessEntity);
//上报到网格化平台
sendItemToDsf(dto,handleProcessEntity);
log.info("处理项目-上报网格化平台-if结束");
// 结案申请
} else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) {
@ -950,6 +950,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// 根据操作人部门，获取上一级部门ID
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId());
SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
sendTypeKey = sysDeptDTO.getTypeKey();
// 手动拼接流转协助部门
ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO();
@ -970,10 +971,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemDeptService.modifyItemDepts(dto.getHandlerDeptId(), dto.getId());
// 记录处理记录
itemHandleProcessService.insert(handleProcessEntity);
if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(sysDeptDTO.getTypeKey())){
//上报到网格化平台
sendItemToDsf(dto,handleProcessEntity);
}
// 新增流转协助部门
itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId());
List<Long> newDeptIds = new ArrayList<>();
@ -1170,6 +1167,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if (dto.getHandleImages() != null && dto.getHandleImages().size() > 0) {
imgService.saveImages(dto.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE);
}
//如果是结案申请并且是社区 || 社区上报
if((ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory() && OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(sendTypeKey))
|| ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()){
//上报到网格化平台
sendItemToDsf(dto,handleProcessEntity);
}
//居民端项目关闭、结案-短信通知
if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){
@ -1688,7 +1691,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
private List<EventHandleListFormDto> getHandleList(String itemId, List<String> handleImagesList) {
//未组装的事件处理流程
List<ItemHandleProgressResultDTO> handleList = baseDao.selectListOfItemHandleProgressByMobile(itemId);
List<ItemHandleProgressResultDTO> handleList = baseDao.selectListOfItemHandleProgressByWork(itemId);
log.info("处理项目-未组装的事件处理流程结束");
//组装后的、所有的 处理事件流程
List<EventHandleListFormDto> resultList = new ArrayList<>();
@ -1706,48 +1709,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemDepts.add(id.getDeptName());
}
handleProcess.setItemDeptDTOS(itemDepts);
// if (ipr.getState() == 0 && ipr.getItemDeptDTOS().size() > 0) {
// handleProcess.setState("吹哨");
// } else if (ipr.getState() == 0 && ipr.getItemDeptDTOS().size() == 0) {
// handleProcess.setState("办理");
// } else if (ipr.getState() == 5) {
// handleProcess.setState("关闭");
// } else if (ipr.getState() == 10) {
// handleProcess.setState("结案");
// } else if ( ipr.getState() == 11 || ipr.getState() == 12 || ipr.getState() == 13) {
// handleProcess.setState("满意度评价");
// } else if (ipr.getState() == 15) {
// handleProcess.setState("上报网格化平台");
// } else if (ipr.getState() == 20) {
// handleProcess.setState("网格化平台-受理");
// } else if (ipr.getState() == 25) {
// handleProcess.setState("网格化平台-立案");
// } else if (ipr.getState() == 30) {
// handleProcess.setState("网格化平台-派遣");
// } else if (ipr.getState() == 35) {
// handleProcess.setState("网格化平台-再派遣");
// } else if (ipr.getState() == 40) {
// handleProcess.setState("网格化平台-接单");
// } else if (ipr.getState() == 45) {
// handleProcess.setState("网格化平台-处置完成");
// } else if (ipr.getState() == 50) {
// handleProcess.setState("网格化平台-中间督办");
// } else if (ipr.getState() == 55) {
// handleProcess.setState("网格化平台-催办");
// } else if (ipr.getState() == 60) {
// handleProcess.setState("网格化平台-结案");
// } else if (ipr.getState() == 65) {
// handleProcess.setState("网格化平台-办理");
// } else if (ipr.getState() == 70) {
// handleProcess.setState("网格化平台-批转");
// } else if (ipr.getState() == 75) {
// handleProcess.setState("网格化平台-退单");
// } else if (ipr.getState() == 80) {
// handleProcess.setState("网格化平台-办结");
// } else {
// handleProcess.setState(ipr.getState().toString());
// }
if (ipr.getState() == 0) {
handleProcess.setState("处理中");
}else if (ipr.getState() == 5) {
@ -1760,6 +1721,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
handleProcess.setState("响应拟办");
} else if ( ipr.getState() == 13) {
handleProcess.setState("直接办理");
} else if (ipr.getState() == 14) {
handleProcess.setState("社区驳回");
} else if (ipr.getState() == 15) {
handleProcess.setState("上报网格化平台");
} else if (ipr.getState() == 20) {
@ -1788,6 +1751,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
handleProcess.setState("网格化平台-退单");
} else if (ipr.getState() == 80) {
handleProcess.setState("网格化平台-办结");
} else if (ipr.getState() == 1001) {
handleProcess.setState("响应拟办");
} else {
handleProcess.setState(ipr.getState().toString());
}

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

@ -726,6 +726,7 @@
<result property="id" column="ID"/>
<result property="createdTime" column="createdTime"/>
<result property="advice" column="advice"/>
<result property="deptAdvice" column="deptAdvice"/>
<result property="handlerDept" column="handlerDept"/>
<result property="state" column="STATE"/>
<collection property="itemDeptDTOS" ofType="com.elink.esua.epdc.dto.item.ItemDeptDTO">
@ -760,6 +761,7 @@
hp.ID,
hp.CREATED_TIME AS createdTime,
hp.OUT_HANDLE_ADVICE AS advice,
hp.HANDLE_ADVICE as deptAdvice,
hp.HANDLER_DEPT AS handlerDept,
hp.STATE,
itemDept.DEPT_NAME,

Write Preview
Loading…
Cancel
Save