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

诉求初验和诉求终验接口

feature/dangjian
zhaoqifeng 3 years ago
parent
b5451a1e0a
commit
903c119192
2 changed files with 29 additions and 6 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. 30
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  2. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

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

@ -4498,12 +4498,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
handleProcessEntity.setHandlerDeptId(deptId);
handleProcessEntity.setHandlerDept(dept.getData().getName());
handleProcessEntity.setItemId(formDTO.getId());
handleProcessEntity.setHandleAdvice(formDTO.getHandleAdvice());
handleProcessEntity.setOutHandleAdvice(formDTO.getOutHandleAdvice());
handleProcessEntity.setHandleAdviceRemark(formDTO.getHandleAdviceRemark());
if (NumConstant.ONE == formDTO.getHandleCategory()) {
//同意，进入终验
//保存处理节点
String handleAdvice = "诉求初验同意,处理意见：";
if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) {
handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
}
handleProcessEntity.setHandleAdvice(handleAdvice);
handleProcessEntity.setOutHandleAdvice(handleAdvice);
handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue());
itemHandleProcessService.insert(handleProcessEntity);
// 删除已流转协助部门
@ -4528,6 +4532,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
item.setId(formDTO.getId());
item.setEvaluationState(NumConstant.ZERO_STR);
baseDao.updateById(item);
String handleAdvice = "诉求初验不同意,处理意见：";
if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) {
handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
}
handleProcessEntity.setHandleAdvice(handleAdvice);
handleProcessEntity.setOutHandleAdvice(handleAdvice);
handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_DISAGREE.getValue());
itemHandleProcessService.insert(handleProcessEntity);
//上报
ItemHandleSubmitFormDTO dto = ConvertUtils.sourceToTarget(formDTO, ItemHandleSubmitFormDTO.class);
dto.setHandlerDeptId(deptId);
@ -4575,11 +4587,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
handleProcessEntity.setHandlerDeptId(deptId);
handleProcessEntity.setHandlerDept(dept.getData().getName());
handleProcessEntity.setItemId(formDTO.getId());
handleProcessEntity.setHandleAdvice(formDTO.getHandleAdvice());
handleProcessEntity.setOutHandleAdvice(formDTO.getOutHandleAdvice());
handleProcessEntity.setHandleAdviceRemark(formDTO.getHandleAdviceRemark());
if (NumConstant.ONE == formDTO.getHandleCategory()) {
//同意，结案
String handleAdvice = "诉求终验同意,处理意见：";
if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) {
handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
}
handleProcessEntity.setHandleAdvice(handleAdvice);
handleProcessEntity.setOutHandleAdvice(handleAdvice);
handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_AGREE.getValue());
itemHandleProcessService.insert(handleProcessEntity);
@ -4606,6 +4622,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
closedItem(dto);
} else {
//不同意，返回初验
String handleAdvice = "诉求终验不同意,处理意见：";
if (StringUtils.isNotBlank(formDTO.getHandleAdvice())) {
handleAdvice = handleAdvice.concat(formDTO.getHandleAdvice());
}
handleProcessEntity.setHandleAdvice(handleAdvice);
handleProcessEntity.setOutHandleAdvice(handleAdvice);
handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_UN_AGREE.getValue());
itemHandleProcessService.insert(handleProcessEntity);
}

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

@ -39,6 +39,7 @@ import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
import com.elink.esua.epdc.dto.item.form.ItemWhistle2GovFormDTO;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
import com.elink.esua.epdc.gird.city.api.CityGridApi;
import com.elink.esua.epdc.gird.shibei.contants.ApiConstants;
import com.elink.esua.epdc.modules.events.dao.ImgDao;
@ -1135,7 +1136,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqzt(CityPushStateEnum.DJA.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CY.getCode());
//初验结果 1：初验通过；0：初验不通过
if (item.getHandleAdvice().contains("已处理")) {
if (ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue() == item.getState()) {
dto.setCzjg(NumConstant.ONE_STR);
} else {
dto.setCzjg(NumConstant.ZERO_STR);
@ -1194,7 +1195,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//当前处理环节
dto.setDqclhj(CityPushLinkEnum.SQ_ZY.getCode());
//终验结果 1：终验通过；0：终验不通过
if (item.getHandleAdvice().contains("已处理")) {
if (ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_AGREE.getValue() == item.getState()) {
dto.setCzjg(NumConstant.ONE_STR);
} else {
dto.setCzjg(NumConstant.ZERO_STR);

Write Preview
Loading…
Cancel
Save