部门使用人重复显示修改

futian.liu

2023-12-08 583f0b0df83876e68e8729d9872f83af08b8ae27

 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java

@@ -6,6 +6,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.stream.Collectors;

@@ -38,11 +39,12 @@
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormTransferCoreService;
import com.consum.base.service.LGoodsUserRecordCoreService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
import com.consum.base.service.LWhProcureModelUserServiceImpl;
import com.consum.base.service.LWhProcureModelUserService;
import com.consum.base.service.impl.LWhFormTransferCoreService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
@@ -79,11 +81,13 @@
    @Autowired
    private LWhFormTransferCoreService lWhFormTransferCoreService;
    @Autowired
    private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
    private LWhProcureModelUserService lWhProcureModelUserService;
    @Autowired
    private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
    @Autowired
    private BaseWarehouseService baseWarehouseService;
    @Autowired
    private LGoodsUserRecordCoreService lGoodsUserRecordCoreService;

    /**
     * @Description 新增
@@ -399,9 +403,9 @@

                lWhProcureModelUserService.insert(procureModelUserList);
            }

            // 使用人修改调用
            lGoodsUserRecordCoreService.modifyGoodsUser(null, lWhProcureModelUserRecord.getId());
        }
        // TODO 使用人修改调用

        return ResponseValue.success();
    }
@@ -427,41 +431,39 @@
        }
        List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();
        // 分组
        Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream().collect(
            Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
        // 开始循环collect
        for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) {
        Map<Long, List<UseRecordDTO>> groupedRecords =
            useRecordDTOList.stream().collect(Collectors.groupingBy(UseRecordDTO::getId));
        for (Entry<Long, List<UseRecordDTO>> entry : groupedRecords.entrySet()) {
            Long id = entry.getKey();
            Map<Long, List<UseRecordDTO>> value = entry.getValue();
            List<UseRecordDTO> useRecordList = entry.getValue();
            UseRecordDTO useRecordDto = useRecordList.get(0);
            // 开始循环value
            GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
            goodsUseRecordVO.setId(id);
            goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
            goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
            List<UseRecordSkuVO> useRecordSkuList = Lists.newArrayList();
            for (Map.Entry<Long, List<UseRecordDTO>> item : value.entrySet()) {
                List<UseRecordDTO> list = item.getValue();
                List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();
                for (UseRecordDTO useRecordDto : list) {

                    GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
                    goodsUseRecordVO.setId(id);
                    goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
                    goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());

            useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId))
                .forEach((key, recordList) -> {
                    UseRecordDTO useRecordDTO = recordList.get(0);
                    UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
                    useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());
                    useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());
                    useRecordSkuVO.setUnit(useRecordDto.getUnit());
                    useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());

                    RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
                    recordUserInfoVO.setUseName(useRecordDto.getUseName());
                    recordUserInfoVO.setPhone(useRecordDto.getPhone());
                    recordUserInfoVO.setNum(useRecordDto.getNum());
                    recordUserInfoList.add(recordUserInfoVO);
                    useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId());
                    useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName());
                    useRecordSkuVO.setUnit(useRecordDTO.getUnit());
                    useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId());
                    List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();
                    for (UseRecordDTO userInfo : recordList) {
                        RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
                        recordUserInfoVO.setUseName(userInfo.getUseName());
                        recordUserInfoVO.setPhone(userInfo.getPhone());
                        recordUserInfoVO.setNum(userInfo.getNum());
                        recordUserInfoList.add(recordUserInfoVO);
                    }
                    useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
                    useRecordSkuList.add(useRecordSkuVO);
                    goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
                    goodsUseRecordList.add(goodsUseRecordVO);
                }
            }
                });
            goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
            goodsUseRecordList.add(goodsUseRecordVO);
        }
        // 分组之后重新排序
        List<GoodsUseRecordVO> result = goodsUseRecordList