Merge remote-tracking branch 'origin/master'

石广澎

2023-12-13 6b36599c6bd372a5cce5e078c2f4e4cb9e2ee36a

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

@@ -1,5 +1,14 @@
package com.consum.base.controller;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
@@ -7,15 +16,10 @@
import com.consum.base.service.LWhProcureModelService;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import io.swagger.annotations.Api;

@Api(value = "物品型号", tags = "物品型号")
@RestController
@RequestMapping("/pc/warehouse/procureModel")
public class LWhProcureModelController extends BaseController {
@@ -31,7 +35,8 @@
        LWhProcureModelQry param2 = new LWhProcureModelQry();
        CommonUtil.copyProperties(param, param2);
        param = param2;
        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
        List<Map<String, Object>> ffOrderByGoodsIdAndDept =
            lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
        if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
            return ResponseValue.success();
        }
@@ -47,14 +52,14 @@
        LWhProcureModelQry param2 = new LWhProcureModelQry();
        CommonUtil.copyProperties(param, param2);
        param = param2;
        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService
            .getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
        if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
            return ResponseValue.success();
        }
        // 按型号分组返回
        return ResponseValue.success(ffOrderByGoodsIdAndDept.stream()
                .collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
        return ResponseValue.success(
            ffOrderByGoodsIdAndDept.stream().collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
    }


}