修改接口

xuhy

2024-09-18 df8bbae8096c4d0f65de373260410bfb9150d146

修改接口

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java

@@ -115,11 +115,12 @@
        if(!CollectionUtils.isEmpty(orderIds)){
            List<TOrderStockGoods> orderStockGoods = tOrderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class)
                    .in(TOrderStockGoods::getOrderId, orderIds));
            list.forEach(orderSale -> {
                List<TOrderStockGoods> collect = orderStockGoods.stream().filter(orderSaleGoods -> orderSaleGoods.getOrderId().equals(orderSale.getId())).collect(Collectors.toList());
            list.forEach(orderStockVO -> {
                List<TOrderStockGoods> collect = orderStockGoods.stream().filter(orderSaleGoods -> orderSaleGoods.getOrderId().equals(orderStockVO.getId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(collect)){
                    orderSale.setOrderStockGoods(collect);
                    orderSale.setTotalPrice(collect.stream().map(TOrderStockGoods::getCostPrice).reduce(BigDecimal::add).get());
                    orderStockVO.setOrderStockGoods(collect);
                    orderStockVO.setOrderStockCount(collect.size());
                    orderStockVO.setTotalPrice(collect.stream().map(TOrderStockGoods::getCostPrice).reduce(BigDecimal::add).get());
                }
            });
        }

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TOrderStockVO.java

@@ -15,6 +15,8 @@

    @ApiModelProperty(value = "进货单商品")
    private List<TOrderStockGoods> orderStockGoods;
    @ApiModelProperty(value = "进货单商品数量")
    private Integer orderStockCount;
    @ApiModelProperty(value = "总价")
    private BigDecimal totalPrice;


 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -135,7 +135,7 @@
    <select id="selectUserById" parameterType="Long" resultType="com.ruoyi.common.core.domain.entity.SysUser">
        select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
               u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
               u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.disableRemark AS disableRemark
               u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.disableRemark AS disableRemark,
               ur.role_id AS roleId,sr.role_name AS roleName
        from sys_user u
        left join sys_user_role ur on u.user_id = ur.user_id