diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java index 38ac7d499..4877ba59f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java @@ -96,6 +96,10 @@ public class SysDeptDTO extends TreeNode implements Serializable { */ private String infoCode; + /**地区编码 + */ + private String areaCode; + public String getPartyCode() { return partyCode; } @@ -203,4 +207,12 @@ public class SysDeptDTO extends TreeNode implements Serializable { public void setInfoCode(String infoCode) { this.infoCode = infoCode; } + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } } 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 aa88ad356..e303924b7 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 @@ -1505,6 +1505,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem if("1".equals(itemEntity.getPeopleFlag())){ //事件来源 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_FZ); + //事件描述 + sendDto.setSJMS("测试事件,请勿处理"+itemEntity.getItemContent());// }else{ //事件描述 sendDto.setSJMS("测试事件,请勿处理"+getItemLawContent(itemEntity.getId())); @@ -1520,7 +1522,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg()); } //所属街道 - sendDto.setSSJD(deptInfo.getInfoCode()); + sendDto.setSSJD(deptInfo.getAreaCode()); //所属社区 sendDto.setSSSQ("");//deptInfo.getCommunityInfoCode() }else{ @@ -1553,16 +1555,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setUID(UUID.randomUUID().toString().trim().replaceAll("-", "")); //事件领域 - Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode()); - if(lingYu < 10){ - sendDto.setSJLYU("0"+itemEntity.getFirstCategoryCode()); - }else{ - sendDto.setSJLYU(itemEntity.getFirstCategoryCode()); - } - log.info("处理项目-事件大类"); +// Integer lingYu = Integer.valueOf(itemEntity.getFirstCategoryCode()); +// if(lingYu < 10){ +// sendDto.setSJLYU("0"+itemEntity.getFirstCategoryCode()); +// }else{ +// sendDto.setSJLYU(itemEntity.getFirstCategoryCode()); +// } +// log.info("处理项目-事件大类"); //事件大类 - String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId()); - lbHandle(sendDto,secondCate); +// String secondCate = baseDao.selectSecondCateByItemId(itemEntity.getId()); +// lbHandle(sendDto,secondCate); + sendDto.setSJLYU("01"); + sendDto.setSJDL("0104"); //诉求联系人及联系方式 Result userResult = userInfoFeignClient.getUserInfoById(itemEntity.getUserId());