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 5d3c4060d..b2fde43f8 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 @@ -466,8 +466,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem data.setSqly(CityPushEnum.SQLY_WX.getCode()); data.setSqzt(CityPushEnum.SQZT_DPQ.getCode()); data.setSbqs(CityPushEnum.SBQS_SB.getCode()); - data.setSqssjg(CityPushEnum.SBQS_SB.getCode()); - data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode()); + //执法诉求所属街道的市中心编码 + String code = ""; + String name = ""; + Result dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId()); + if (!dtoResult.success()) { + code = dtoResult.getData().getDisCenterZoningCode(); + name = dtoResult.getData().getName(); + } + /*data.setSqssjg(CityPushEnum.SBQS_SB.getCode()); + data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode());*/ + data.setSqssjg(code); + data.setSqssjgmc(name); data.setSqcssy("执法诉求上报"); //组装数据 QueryWrapper wrapper = new QueryWrapper<>(); @@ -508,8 +518,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem sqdjr.setXm(entity.getNickName()); sqdjr.setSsbm(entity.getGrid()); sqdjr.setSsbmbm(entity.getGridId().toString()); - sqdjr.setSsjg(entity.getGrid()); - sqdjr.setSsjgbm(getJgbm(entity.getGridId())); + sqdjr.setSsjg(code); + sqdjr.setSsjgbm(name); data.setSqdjr(sqdjr); // todo jack照片格式调整为http List imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId()); @@ -2854,8 +2864,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem data.setSqzt(CityPushEnum.SQZT_DPQ.getCode()); data.setDqclhj(CityPushEnum.DQCLHJ_DJ.getCode()); data.setSbqs(CityPushEnum.SBQS_SB.getCode()); - data.setSqssjg(CityPushEnum.SBQS_SB.getCode()); - data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode()); + //民生诉求所属网格对应的所属社区的市中心编码 + String code = ""; + String name = ""; + Result result = adminFeignClient.getCompleteDept(entity.getGridId()); + if(result.success()){ + code = result.getData().getCommunityDisCenterZoningCode(); + name = result.getData().getCommunity(); + } + /* data.setSqssjg(CityPushEnum.SBQS_SB.getCode()); + data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode());*/ + data.setSqssjg(code); + data.setSqssjgmc(name); data.setSbrlxfs(entity.getMobile()); data.setSqzynr(entity.getItemContent()); data.setSqdz(entity.getIssueAddress()); @@ -2868,8 +2888,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO(); sqdjr.setId(entity.getId()); sqdjr.setXm(entity.getNickName()); - sqdjr.setSsbm(entity.getGrid()); - sqdjr.setSsbmbm(entity.getGridId().toString()); + sqdjr.setSsbm(code); + sqdjr.setSsbmbm(name); sqdjr.setSsjg(entity.getGrid()); sqdjr.setSsjgbm(getJgbm(entity.getGridId())); data.setSqdjr(sqdjr); @@ -2910,8 +2930,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem data.setSqly(CityPushEnum.SQLY_WX.getCode()); data.setSqzt(CityPushEnum.SQZT_DPQ.getCode()); data.setSbqs(CityPushEnum.SBQS_SB.getCode()); - data.setSqssjg(CityPushEnum.SBQS_SB.getCode()); - data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode()); + //执法诉求所属街道的市中心编码 + String code = ""; + String name = ""; + Result dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId()); + if (!dtoResult.success()) { + code = dtoResult.getData().getDisCenterZoningCode(); + name = dtoResult.getData().getName(); + } + /*data.setSqssjg(CityPushEnum.SBQS_SB.getCode()); + data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode());*/ + data.setSqssjg(code); + data.setSqssjgmc(name); //组装企业数据 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("item_id", entity.getId()); @@ -2935,8 +2965,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem sqdjr.setXm(entity.getNickName()); sqdjr.setSsbm(entity.getGrid()); sqdjr.setSsbmbm(entity.getGridId().toString()); - sqdjr.setSsjg(entity.getGrid()); - sqdjr.setSsjgbm(getJgbm(entity.getGridId())); + sqdjr.setSsjg(code); + /* sqdjr.setSsjgbm(getJgbm(entity.getGridId()));*/ + sqdjr.setSsjgbm(name); data.setSqdjr(sqdjr); // todo jack照片格式调整为http List imageList = imgDao.selectListByRefeId(entity.getEventId() == null?entity.getId():entity.getEventId());