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

Merge remote-tracking branch 'origin/feature/pushCaseTo_city' into feature/pushCaseTo_city

feature/dangjian
sunyuchao 3 years ago
parent
c2253b2f0d 55e95f8ee6
commit
cf5d4d1634
3 changed files with 10 additions and 32 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. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 38
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
View File

@ -49,7 +49,7 @@ public enum ItemGridPlatformHandleStatusEnum {
HANDLE_YQSH(1100, "延期审核"),
HANDLE_SQBJ(1101, "申请办结"),
HANDLE_CZ(1102, "处置"),
HANDLE_HCSB(1103, "核查上报"),
HANDLE_HCSB(1103, "上报核查"),
HANDLE_ZCZ(1104, "再处置"),
HANDLE_OTHER(999, "派遣中");

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

@ -2528,7 +2528,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
} else if(ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == dto.getState()){
//初验申请
pushToCityGridService.earlyInspectionApply(dto);
} else if(ItemGridPlatformHandleStatusEnum.HANDLE_PZ.getValue() == dto.getState()){
} else if(ItemGridPlatformHandleStatusEnum.HANDLE_HCSB.getValue() == dto.getState()){
//诉求初验
pushToCityGridService.earlyInspection(dto);
//诉求终验

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

@ -1057,21 +1057,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
List<ItemHandleProcessDTO> list = new ArrayList<>();
if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId());
LambdaQueryWrapper<ItemHandleProcessEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ItemHandleProcessEntity::getItemId, item.getItemId());
wrapper.ne(ItemHandleProcessEntity::getId, item.getId());
wrapper.lt(ItemHandleProcessEntity::getCreatedTime, item.getCreatedTime());
wrapper.orderByDesc(ItemHandleProcessEntity::getCreatedTime);
List<ItemHandleProcessEntity> processList = itemHandleProcessDao.selectList(wrapper);
if (CollectionUtils.isEmpty(processList)) {
return;
}
if (ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == processList.get(NumConstant.ZERO).getState()) {
String sqId = getSqid(item.getItemId());
if (StringUtils.isNotBlank(sqId)) {
ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class);
list.add(dto);
}
String sqId = getSqid(item.getItemId());
if (StringUtils.isNotBlank(sqId)) {
ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class);
list.add(dto);
}
} else {
// 昨天
@ -1125,21 +1114,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
List<ItemHandleProcessDTO> list = new ArrayList<>();
if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId());
LambdaQueryWrapper<ItemHandleProcessEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ItemHandleProcessEntity::getItemId, item.getItemId());
wrapper.ne(ItemHandleProcessEntity::getId, item.getId());
wrapper.lt(ItemHandleProcessEntity::getCreatedTime, item.getCreatedTime());
wrapper.orderByDesc(ItemHandleProcessEntity::getCreatedTime);
List<ItemHandleProcessEntity> processList = itemHandleProcessDao.selectList(wrapper);
if (CollectionUtils.isEmpty(processList)) {
return;
}
if (ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == processList.get(NumConstant.ZERO).getState()) {
String sqId = getSqid(item.getItemId());
if (StringUtils.isNotBlank(sqId)) {
ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class);
list.add(dto);
}
String sqId = getSqid(item.getItemId());
if (StringUtils.isNotBlank(sqId)) {
ItemHandleProcessDTO dto = ConvertUtils.sourceToTarget(item, ItemHandleProcessDTO.class);
list.add(dto);
}
} else {
// 昨天

Write Preview
Loading…
Cancel
Save