blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
1 天以前 43322d13c1876b1705f8ba1eb2ef32e7a433cacc 
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java


@@ -9,7 +9,9 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.example.erp.common.Constants;


import com.example.erp.common.Result;


import com.example.erp.dto.sd.OrderDTO;


import com.example.erp.dto.sd.OrderSearchDTO;


import com.example.erp.entity.sd.*;


@@ -619,6 +621,7 @@


        }


        List<OrderDetail> orderDetailList = orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail,model,scope);


        List<BasicOtherMoney> basicOtherMoneyList=basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>());




        ObjectMapper objectMapper = new ObjectMapper();




        for (OrderDetail detail : orderDetailList) {


@@ -640,6 +643,10 @@


        map.put("data",orderDetailList);


        map.put("title",basicOtherMoneyList);


        map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail,"order"));


        map.put("orderOtherMoney",


                Collections.singletonList(


                        basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))


                ));


        List<String> list = new ArrayList<>();


        list.add(startDate);


        list.add(endDate);


@@ -1123,4 +1130,12 @@


        map.put("data",processList);


        return map;


    }




    public Result sizeCheck(String orderId) {




        return Result.success(


                orderMapper.update(null,


                        new UpdateWrapper<Order>().set("size_check",1).eq("order_id",orderId))


        );


    }


}