diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java index 230c05fbb..edf4366dd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java @@ -207,6 +207,16 @@ public class ItemDetailForPCEndResultDTO implements Serializable { */ private String firstCategoryCode; + /** + * 全部分类编码 + */ + private String categoryFullCode; + + /** + * 全部分类编码List + */ + private String[] categoryIds; + } 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 124be83fa..b1028d654 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 @@ -596,6 +596,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); + // 解析分类全部编码[前端分类复显使用] + String categoryFullCode = resultDTO.getCategoryFullCode(); + String[] categoryIds = categoryFullCode.split("-"); + resultDTO.setCategoryIds(categoryIds); + //获取项目基本信息 ItemEntity entity = this.selectById(id); // 获取项目处理进度 @@ -1161,6 +1166,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setCategoryCode(categoryInfo.getCategoryCode()); itemEntity.setFirstCategoryCode(categoryInfo.getFirstCategoryCode()); itemEntity.setCategoryFullName(categoryInfo.getCategoryFullName()); + itemEntity.setCategoryFullCode(categoryInfo.getCategoryFullCode()); } baseDao.updateById(itemEntity); @@ -1335,20 +1341,27 @@ public class ItemServiceImpl extends BaseServiceImpl implem resultDto.setFirstCategoryCode(cateList.get(0).getCategoryCode()); //分类标签全称拼接:-分割 String name = ""; + //分类标签code拼接:-分割 + String code = ""; for (int i = 0; i < cateList.size(); i++) { if (i == cateList.size() - 1) { name = name + cateList.get(i).getCategoryName(); + code = code + cateList.get(i).getCategoryCode(); } else { name = name + cateList.get(i).getCategoryName() + "-"; + code = code + cateList.get(i).getCategoryCode() + "-"; } } name = name + "-" + cateDto.getCategoryName(); + code = code + "-" + cateDto.getCategoryCode(); resultDto.setCategoryFullName(name); + resultDto.setCategoryFullCode(code); // 所选分类标签为一级 } else { //当前标签作为一级标签 resultDto.setFirstCategoryCode(cateDto.getCategoryCode()); resultDto.setCategoryFullName(cateDto.getCategoryName()); + resultDto.setCategoryFullCode(cateDto.getCategoryCode()); } return resultDto; 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 1e82efc97..c419ad546 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 @@ -700,6 +700,7 @@ + @@ -724,6 +725,7 @@ item.HANDLE_PEOPLE_MOBILE, item.category_code, item.first_category_code, + item.CATEGORY_FULL_CODE, eve.APPROVE_NUM, eve.OPPOSE_NUM, eve.COMMENT_NUM,