diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 66154aa34..f694c0262 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 66154aa34097995cc8411ae3ede7179ba3c1d182 +Subproject commit f694c0262c4675a2b28eb2148cf952bf8417be87 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java index 01fc9f817..a349202d3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java @@ -27,6 +27,9 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_PZ(70, "批转"), HANDLE_TD(75, "退单"), HANDLE_BJ(80, "办结"), + HANDLE_XFHC(1062, "下发核查"), + HANDLE_CZWC(1063, "处置完成"), + HANDLE_DB(1064, "督办"), HANDLE_BH(1065, "驳回"), HANDLE_CX(1066, "撤消办理"); 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 7f23c6bbf..aa88ad356 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 @@ -1551,6 +1551,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //推送端记录唯一标识 sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", "")); + //事件领域 Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode()); if(lingYu < 10){ @@ -1561,17 +1562,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem log.info("处理项目-事件大类"); //事件大类 String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId()); - if(StringUtils.isNotBlank(secondCate)){ - if(secondCate.length()==3){ - sendDto.setSJDL("0"+secondCate); - }else{ - sendDto.setSJDL(secondCate); - } - } - //事件小类 - sendDto.setSJXL(""); - //事件细类 - sendDto.setSJXIL(""); + lbHandle(sendDto,secondCate); //诉求联系人及联系方式 Result userResult = userInfoFeignClient.getUserInfoById(itemEntity.getUserId()); @@ -2583,5 +2574,47 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().ok("操作成功"); } + /** + * 领域类别处理 + * + * @param + * @return void + * @author zhy + * @date 2022/9/6 21:14 + */ + private void lbHandle(SendEventFormDto dto,String secondCategory){ + if(StringUtils.isNotBlank(secondCategory)){ + int length =secondCategory.length(); + if(length % 2 == 0){ + // 偶数 + }else { + // 奇数 + secondCategory = "0"+secondCategory; + } + if(length>2){ + // 每隔2位加一个逗号 + secondCategory= secondCategory.replaceAll("(.{2})", "$1,"); + String[] categoryList = secondCategory.split(","); + if(categoryList.length==NumConstant.TWO){ + // 事件大类 + dto.setSJDL(categoryList[1]); + }else if(categoryList.length==NumConstant.THREE){ + // 事件大类 + dto.setSJDL(categoryList[1]); + //事件小类 + dto.setSJXL(categoryList[2]); + }else if(categoryList.length==NumConstant.FOUR){ + // 事件大类 + dto.setSJDL(categoryList[1]); + //事件小类 + dto.setSJXL(categoryList[2]); + //事件细类 + dto.setSJXIL(categoryList[3]); + } + + } + + } + } }