diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemChangeCategoryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemChangeCategoryDTO.java new file mode 100644 index 000000000..9fcd9c2c1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemChangeCategoryDTO.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 重复数据 + * + * @author zhy + * @date 2022/11/29 10:18 + */ +@Data +public class ItemChangeCategoryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String itemId; + + private String categoryId; + + private String categoryFullId; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java index 5b171cd47..13a9f78d5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java @@ -151,4 +151,8 @@ public class ItemAppealDetailResultDTO implements Serializable { */ private String solutionInfo; + private String categoryFullCode; + + private String[] categoryIds; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 6ff39c3b0..8d9063780 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -692,5 +692,11 @@ public class ItemController { return itemService.changeRepeat(dto); } + + @PostMapping("changeCategory") + public Result changeCategory(@RequestBody ItemChangeCategoryDTO dto) { + return itemService.changeCategory(dto); + } + } 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 6ea48a1c5..2e318f841 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 @@ -781,4 +781,6 @@ public interface ItemService extends BaseService { Result processNotice(AcceptProcessNoticeDTO formDTO); Result changeRepeat(ItemChangeRepeatDTO dto); + + Result changeCategory(ItemChangeCategoryDTO dto); } 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 8c4b6d141..57317c21c 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 @@ -1105,10 +1105,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); // 解析分类全部编码[前端分类复显使用] - if (StringUtils.isNotBlank(resultDTO.getCategoryFullCode())) { - String categoryFullCode = resultDTO.getCategoryFullCode(); - String[] categoryIds = categoryFullCode.split("-"); - resultDTO.setCategoryIds(categoryIds); + if (resultDTO!=null && resultDTO.getCategoryFullCode()!=null){ + if (StringUtils.isNotBlank(resultDTO.getCategoryFullCode())) { + String categoryFullCode = resultDTO.getCategoryFullCode(); + String[] categoryIds = categoryFullCode.split("-"); + resultDTO.setCategoryIds(categoryIds); + } } //获取项目基本信息 @@ -3766,6 +3768,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result getItemAppealDetail(String id) { ItemAppealDetailResultDTO result = baseDao.getItemAppealDetail(id); + + if (StringUtils.isNotBlank(result.getCategoryFullCode())) { + String categoryFullCode = result.getCategoryFullCode(); + String[] categoryIds = categoryFullCode.split("-"); + result.setCategoryIds(categoryIds); + } + // 获取项目处理进度 List dtoList = baseDao.selectListOfItemHandleProgressByWork(id); result.setHandleProgressResultDTOS(dtoList); @@ -5028,6 +5037,19 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result(); } + @Override + public Result changeCategory(ItemChangeCategoryDTO dto) { + ItemEntity itemEntity = baseDao.selectById(dto.getItemId()); + if (itemEntity!=null){ + itemEntity.setCategoryCode(dto.getCategoryId()); + itemEntity.setCategoryFullCode(dto.getCategoryFullId()); + baseDao.updateById(itemEntity); + }else { + throw new RenException("该item不存在" + dto.getItemId()); + } + return new Result(); + } + /** * 重新上报 * 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 fd6d78467..b3d5e1e43 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 @@ -2391,6 +2391,7 @@ + @@ -2417,6 +2418,7 @@ item.DURATION, item.CONTACT_NAME, item.SOLUTION_INFO, + item.CATEGORY_FULL_CODE, ifnull(EVALUATION_SCORE,2) as EVALUATION_SCORE, case EVALUATION_SCORE when '0' then '不满意'