diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 762d085bc..002e4550f 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 762d085bcbdca1cc88e670956a3cd147537abec2 +Subproject commit 002e4550fa6be4e5921daa98e3a2bf77ca8b62fb diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java index bdcc7ece5..c96667587 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java @@ -217,6 +217,16 @@ public class ItemDTO implements Serializable { */ private String allDeptNames; + /** + * 分类code + */ + private String categoryCode; + + /** + * 12345平台原始code + */ + private String categoryCodeOrigin; + /** * 分类全称 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 652b89f65..0abe152c5 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -45,6 +45,16 @@ import java.util.Map; @Mapper public interface ItemDao extends BaseDao { + /** + * 查询类别 + * + * @param id + * @return ItemDTO + * @author + * @date + */ + ItemDTO getCategoryInfo(@Param("id") String id); + /** * 根据议题ID获取项目信息 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 7b5337974..e383283dc 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -109,7 +109,7 @@ public interface ItemService extends BaseService { ItemDTO get(String id); /** - * 单条查询 + * 查询类别 * * @param id * @return ItemDTO 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 18b9fb27c..3444e7c2e 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 @@ -436,8 +436,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public ItemDTO getCategoryInfo(String id) { - ItemEntity entity = baseDao.getCategoryInfo(id); - return ConvertUtils.sourceToTarget(entity, ItemDTO.class); + return baseDao.getCategoryInfo(id); } @Override diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index a6ba45496..ce94bcf08 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -581,7 +581,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { String id = processDTO.getId(); String itemId = processDTO.getItemId(); AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId()); - ItemDTO itemDTO = itemService.get(itemId); + ItemDTO itemDTO = itemService.getCategoryInfo(itemId); if (null == item || itemDTO == null) { log.error("流程节点不存在"); return new Result(); @@ -645,7 +645,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { data.setClfj(clfjList); } // 处理类型 - data.setSqlx("itemDTO.getcate"); + data.setSqlx(itemDTO.getCategoryCodeOrigin()); // 处理时间 data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN)); // 处理内容 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index a84801e4e..b68068dcb 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -2,6 +2,19 @@ + + +